aboutsummaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2011-06-29 10:22:04 -0400
committerMike Lockwood <lockwood@android.com>2011-06-29 10:22:04 -0400
commit718a2f7872edcb82e66be8e789c4727e8478d73f (patch)
tree14ecb87ca8926cd9c232ad439a93c61770580478 /etc
parent9d2629c1c40a3469aa28fb8c93c81f76ab46dc94 (diff)
downloadbootable_recovery-718a2f7872edcb82e66be8e789c4727e8478d73f.zip
bootable_recovery-718a2f7872edcb82e66be8e789c4727e8478d73f.tar.gz
bootable_recovery-718a2f7872edcb82e66be8e789c4727e8478d73f.tar.bz2
init.rc: Simplify logic for starting adbd in recovery
Always start adbd if ro.debuggable=1 rather than basing it on user preference in persistent system properties. Use new D001 product ID, which I just allocated for "android recovery mode" Change-Id: I6f1eac5257eaad2e538c0a8dd549ad89219efa3e Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'etc')
-rw-r--r--etc/init.rc31
1 files changed, 6 insertions, 25 deletions
diff --git a/etc/init.rc b/etc/init.rc
index fad32df..58e2973 100644
--- a/etc/init.rc
+++ b/etc/init.rc
@@ -31,35 +31,16 @@ service recovery /sbin/recovery
service adbd /sbin/adbd recovery
disabled
-on property:persist.sys.usb.config=*
- setprop sys.usb.config $persist.sys.usb.config
-
-#one of the following property triggers will enable adb if it is enabled in regular operation
-
-on property:sys.usb.config=mass_storage,adb
- write /sys/class/android_usb/android0/enable 0
- write /sys/class/android_usb/android0/idVendor 18d1
- write /sys/class/android_usb/android0/idProduct Fec0
- write /sys/class/android_usb/android0/functions $sys.usb.config
- write /sys/class/android_usb/android0/enable 1
- start adbd
-
-on property:sys.usb.config=mtp,adb
- write /sys/class/android_usb/android0/enable 0
- write /sys/class/android_usb/android0/idVendor 18d1
- write /sys/class/android_usb/android0/idProduct Fec0
- write /sys/class/android_usb/android0/functions $sys.usb.config
- write /sys/class/android_usb/android0/enable 1
- start adbd
-
-on property:sys.usb.config=ptp,adb
+# Always start adbd on userdebug and eng builds
+on property:ro.debuggable=1
write /sys/class/android_usb/android0/enable 0
- write /sys/class/android_usb/android0/idVendor 18d1
- write /sys/class/android_usb/android0/idProduct Fec0
- write /sys/class/android_usb/android0/functions $sys.usb.config
+ write /sys/class/android_usb/android0/idVendor 18D1
+ write /sys/class/android_usb/android0/idProduct D001
+ write /sys/class/android_usb/android0/functions adb
write /sys/class/android_usb/android0/enable 1
start adbd
+# Restart adbd so it can run as root
on property:service.adb.root=1
write /sys/class/android_usb/android0/enable 0
restart adbd