Merge "adb: increase adb [un]root timeout." am: 6bc132846a

am: bead01860d

Change-Id: I9c5d7e914d27705f3f021a476ac9adf19ec7039a
This commit is contained in:
Josh Gao 2019-05-02 09:19:02 -07:00 committed by android-build-merger
commit 1f37bbb38c

View file

@ -1142,7 +1142,7 @@ static bool adb_root(const char* command) {
// If we were using a specific transport ID, there's nothing we can wait for.
if (previous_id == 0) {
adb_set_transport(previous_type, previous_serial, 0);
wait_for_device("wait-for-device", 3000ms);
wait_for_device("wait-for-device", 6000ms);
}
return true;