From 48a348183f5f4478ca5b0ca2059fa829648fc090 Mon Sep 17 00:00:00 2001 From: Josh Gao Date: Wed, 13 Apr 2016 12:22:27 -0700 Subject: [PATCH] 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 --- adb/commandline.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adb/commandline.cpp b/adb/commandline.cpp index 6c3a1a5ba..f5d13c3fc 100644 --- a/adb/commandline.cpp +++ b/adb/commandline.cpp @@ -1104,7 +1104,7 @@ static bool adb_root(const char* command) { 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