diff options
| author | Benoit Goby <benoit@android.com> | 2012-03-26 12:56:49 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-03-26 12:56:49 -0700 |
| commit | 62e5cbaebc29d83148dd1ce30a620a37dcdbe7ed (patch) | |
| tree | 51570508dbb1eceabc1c9e4f0d1d0416f6e987e3 /rootdir/init.rc | |
| parent | 8ee361cb01e20b3fb0980f428cf83d0e1181a4bd (diff) | |
| parent | 7941cf87f624e7747b5bb868a27904c7a3be0ca4 (diff) | |
| download | system_core-62e5cbaebc29d83148dd1ce30a620a37dcdbe7ed.tar.gz system_core-62e5cbaebc29d83148dd1ce30a620a37dcdbe7ed.tar.bz2 system_core-62e5cbaebc29d83148dd1ce30a620a37dcdbe7ed.zip | |
Merge "Revert "Reimplement the "adb root" command to more closely match its previous behavior""
Diffstat (limited to 'rootdir/init.rc')
| -rw-r--r-- | rootdir/init.rc | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/rootdir/init.rc b/rootdir/init.rc index 17374f09..d035345b 100644 --- a/rootdir/init.rc +++ b/rootdir/init.rc @@ -379,18 +379,6 @@ service adbd /sbin/adbd on property:ro.kernel.qemu=1 start adbd -# This property trigger has added to imitiate the previous behavior of "adb root". -# The adb gadget driver used to reset the USB bus when the adbd daemon exited, -# and the host side adb relied on this behavior to force it to reconnect with the -# new adbd instance after init relaunches it. So now we force the USB bus to reset -# here when adbd sets the service.adb.root property to 1. We also restart adbd here -# rather than waiting for init to notice its death and restarting it so the timing -# of USB resetting and adb restarting more closely matches the previous behavior. -on property:service.adb.root=1 - write /sys/class/android_usb/android0/enable 0 - restart adbd - write /sys/class/android_usb/android0/enable 1 - service servicemanager /system/bin/servicemanager class core user system |