commit 86441c31fe256f37625743e2818377ce5e3dec05
author Josh Gao <jmgao@google.com> Wed Apr 13 12:18:58 2016 -0700
committer Josh Gao <jmgao@google.com> Wed Apr 13 12:28:04 2016 -0700
tree 1db6d085012f07ed3bf24ddf5ddfa1caf6cf8efb
parent 08881e72f4b01302742e027225145b061202c528

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

Allow waiting for a device in any state.

Bug: http://b/28168212
Change-Id: I1876ecd70089ca88f2da5de4182e13724ec50501

adb/commandline.cpp

diff --git a/adb/commandline.cpp b/adb/commandline.cpp
index 411b0ba..6c3a1a5 100644
--- a/adb/commandline.cpp
+++ b/adb/commandline.cpp
@@ -1049,11 +1049,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;
     }