| commit | 94622690f65a3f5c168f29d4c79799b895b186b5 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Thu May 02 15:53:20 2019 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu May 02 15:53:20 2019 +0000 |
| tree | 788652cfea9e07351cc19f9c06de4e5b993ac32d | |
| parent | 6ed5601b0d29acc805efbcb247c91176e319dfb2 [diff] | |
| parent | b0eedc0286c12c0d911ba21861658a5873293a82 [diff] |
Merge "adb: increase `adb [un]root` timeout."
diff --git a/adb/client/commandline.cpp b/adb/client/commandline.cpp index e2a17c5..f39aa58 100644 --- a/adb/client/commandline.cpp +++ b/adb/client/commandline.cpp
@@ -1142,7 +1142,7 @@ // 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;