ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge \\\"adb: make adb root not wait-for-device.\\\" am: 81e59ca5a7 am: ba7aea829b

Browse source 
am: 483d68ece4

Change-Id: I66cd2297d253ecf95843d85d2670c047ff816548
This commit is contained in:
Josh Gao 2016-06-16 22:49:15 +00:00 • committed by android-build-merger
commit eb1be4087d
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; return true;
} }
// Give adbd 500ms to kill itself, then wait-for-device for it to come back up. // Give adbd some time to kill itself and come back up.
adb_sleep_ms(500); // We can't use wait-for-device because devices (e.g. adb over network) might not come back.
TransportType type; adb_sleep_ms(3000);
const char* serial; return true;
adb_get_transport(&type, &serial);
return wait_for_device("wait-for-any", type, serial);
} }
// Connects to the device "shell" service with |command| and prints the // Connects to the device "shell" service with |command| and prints the