commit f20807ea45219e21d96a3fa4b532ab36996eafc6
author Josh Gao <jmgao@google.com> Thu May 02 09:19:02 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu May 02 09:19:02 2019 -0700
tree 9f3a25321d6095399d7f693b0ee0d5c536b002d4
parent 6e92a0bc76de1dca845b5752e13c7d6c8fcc6054
parent 9a13c0be24ef8f65ff6a1b7e42f426622b913449

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

Change-Id: I9c5d7e914d27705f3f021a476ac9adf19ec7039a

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;