summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlolmaxlik <ilya.lebedev.2003@mail.ru>2016-09-04 23:01:19 +0600
committerlolmaxlik <ilya.lebedev.2003@mail.ru>2016-09-04 23:01:19 +0600
commit18e2c58de8ede70bafe9361c6f29408ae4b41ed7 (patch)
tree403f0bee767b2c2675e91c71a357887155c7836e
parent7cebcd46c8d5644c9c469d9a34425fba2f4c68e8 (diff)
peach: rootdir: fix cherry-picked files
-rwxr-xr-xrootdir/etc/init.target.rc4
1 files changed, 0 insertions, 4 deletions
diff --git a/rootdir/etc/init.target.rc b/rootdir/etc/init.target.rc
index 3a234ae..60cfd9f 100755
--- a/rootdir/etc/init.target.rc
+++ b/rootdir/etc/init.target.rc
@@ -172,11 +172,7 @@ service calibacc /system/bin/accelcal
on property:sys.sensors.acc=*
start calibacc
-<<<<<<< HEAD
-=======
on property:sys.boot_completed=1
# Temp hack to fix torch not being registered on boot
restart media
-
->>>>>>> 80d5451... Try to fix disappearing torch tile by restarting media service after phone is fully booted