commit 9ea7795d38e92d8d01135fdfe7e9a0b74a65e5c8
author Josh Gao <jmgao@google.com> Wed Apr 13 12:22:27 2016 -0700
committer Josh Gao <jmgao@google.com> Wed Apr 13 13:13:20 2016 -0700
tree 59019f54cabd47247d8791ff7c953dc2ae0719a6
parent 5863fb61e142ec8494443ba341e240f9fe86934b

adb: after `adb root`, wait for the device in any state.

Otherwise, `adb root` while the device is in recovery will hang.

Bug: http://b/28168212
Change-Id: Ibc8038b1745139fb505e466c74c605b9df474c8c
(cherry picked from commit 48a348183f5f4478ca5b0ca2059fa829648fc090)

adb/commandline.cpp

diff --git a/adb/commandline.cpp b/adb/commandline.cpp
index f904df7..b828c41 100644
--- a/adb/commandline.cpp
+++ b/adb/commandline.cpp
@@ -1112,7 +1112,7 @@
     TransportType type;
     const char* serial;
     adb_get_transport(&type, &serial);
-    return wait_for_device("wait-for-device", type, serial);
+    return wait_for_device("wait-for-any", type, serial);
 }
 
 // Connects to the device "shell" service with |command| and prints the