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

Merge \"adb: make adb root not wait-for-device.\" 

am: 81e59ca5a7

Change-Id: I231ad44c7b6293256f33eb3fd617b4e5da728ca1
This commit is contained in:
Josh Gao 2016-06-16 22:41:08 +00:00 committed by android-build-merger
parent bf5f0fae07 81e59ca5a7
commit ba7aea829b
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
adb/commandline.cpp
View File

@ -1107,12 +1107,10 @@ static bool adb_root(const char* command) {
return true;
}
// Give adbd 500ms to kill itself, then wait-for-device for it to come back up.
adb_sleep_ms(500);
TransportType type;
const char* serial;
adb_get_transport(&type, &serial);
return wait_for_device("wait-for-any", type, serial);
// Give adbd some time to kill itself and come back up.
// We can't use wait-for-device because devices (e.g. adb over network) might not come back.
adb_sleep_ms(3000);
return true;
}
// Connects to the device "shell" service with |command| and prints the