commit 4e5b2922991dddf03c122963fb197968de5764e3
author Josh Gao <jmgao@google.com> Thu Feb 25 18:43:42 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 25 18:43:42 2016 +0000
tree cefe81ed131d4d36c1debc50bfcfc3f745a5df76
parent 77dc40f2fa3126871f64bc9e13a374d29bc3440f
parent f56c39194f1c2a4f0ea5d2ac20aebf80de4b0ae7

Merge "adb: bail out if wait_for_device fails in send_shell_command."

adb/commandline.cpp

diff --git a/adb/commandline.cpp b/adb/commandline.cpp
index 8e76168..37d1146 100644
--- a/adb/commandline.cpp
+++ b/adb/commandline.cpp
@@ -1106,8 +1106,9 @@
         }
 
         fprintf(stderr,"- waiting for device -\n");
-        adb_sleep_ms(1000);
-        wait_for_device("wait-for-device", transport_type, serial);
+        if (!wait_for_device("wait-for-device", transport_type, serial)) {
+            return 1;
+        }
     }
 
     int exit_code = read_and_dump(fd, use_shell_protocol);