commit 9a13c0be24ef8f65ff6a1b7e42f426622b913449
author Josh Gao <jmgao@google.com> Thu May 02 09:13:50 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu May 02 09:13:50 2019 -0700
tree b90d5934cad0f76137b0bb2dd0a4f2b8f5d722b2
parent 9e0e2ba608f61840a307ecc009c33c1ac132b37f
parent 94622690f65a3f5c168f29d4c79799b895b186b5

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

Change-Id: Ia10b398b1305bd6d9ae319cd8b929ee546284739

adb/client/commandline.cpp

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;