openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "Reimplement the "adb root" command to more closely match its previous behavior" 

This reverts commit 535164e9d9.
This commit is contained in:
Benoit Goby 2012-03-16 14:44:17 -07:00
parent 9f1af8cde9
commit 7941cf87f6
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
adb/services.c
View File

@ -125,12 +125,14 @@ void restart_root_service(int fd, void *cookie)
return;
}
property_set("service.adb.root", "1");
snprintf(buf, sizeof(buf), "restarting adbd as root\n");
writex(fd, buf, strlen(buf));
adb_close(fd);
// This will cause a property trigger in init.rc to restart us
property_set("service.adb.root", "1");
// quit, and init will restart us as root
sleep(1);
exit(1);
}
}

12
rootdir/init.rc
View File

@ -376,18 +376,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