commit 5863fb61e142ec8494443ba341e240f9fe86934b
author Josh Gao <jmgao@google.com> Wed Apr 13 12:18:58 2016 -0700
committer Josh Gao <jmgao@google.com> Wed Apr 13 13:13:17 2016 -0700
tree c31660546c4f2d7ddd4612f4b8d579693037b010
parent 3d8df3cb2a80676b35a0641c03e1164eb876883f

adb: add support for 'wait-for-any'.

Allow waiting for a device in any state.

Bug: http://b/28168212
Change-Id: I1876ecd70089ca88f2da5de4182e13724ec50501
(cherry picked from commit 86441c31fe256f37625743e2818377ce5e3dec05)

adb/commandline.cpp

diff --git a/adb/commandline.cpp b/adb/commandline.cpp
index 9b3c3e2..f904df7 100644
--- a/adb/commandline.cpp
+++ b/adb/commandline.cpp
@@ -1057,11 +1057,11 @@
         return false;
     }
 
-    if (components[3] != "bootloader" && components[3] != "device" && components[3] != "recovery" &&
-        components[3] != "sideload") {
+    if (components[3] != "any" && components[3] != "bootloader" && components[3] != "device" &&
+        components[3] != "recovery" && components[3] != "sideload") {
         fprintf(stderr,
                 "adb: unknown state %s; "
-                "expected 'bootloader', 'device', 'recovery', or 'sideload'\n",
+                "expected 'any', 'bootloader', 'device', 'recovery', or 'sideload'\n",
                 components[3].c_str());
         return false;
     }