| commit | 6bc132846a4968c1c4862979226143547df52841 | [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 | 2d3becd3617c853bcd8ad667914e5f5a5a81e420 [diff] | |
| parent | ef4a99934368e8b0263c7f0bbad5d22d00df4c7e [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;