From 718a2f7872edcb82e66be8e789c4727e8478d73f Mon Sep 17 00:00:00 2001 From: Mike Lockwood Date: Wed, 29 Jun 2011 10:22:04 -0400 Subject: 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 --- etc/init.rc | 31 ++++++------------------------- 1 file changed, 6 insertions(+), 25 deletions(-) (limited to 'etc') diff --git a/etc/init.rc b/etc/init.rc index fad32df67..58e2973f3 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 -- cgit v1.2.3