From f56c39194f1c2a4f0ea5d2ac20aebf80de4b0ae7 Mon Sep 17 00:00:00 2001
From: Josh Gao <jmgao@google.com>
Date: Wed, 24 Feb 2016 15:16:17 -0800
Subject: [PATCH] adb: bail out if wait_for_device fails in send_shell_command.

Bug: http://b/27166186
Change-Id: Ib7e9d7e6b909d67a3af94c3517a6a0b54cf17db7
---
 adb/commandline.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/adb/commandline.cpp b/adb/commandline.cpp
index 8e76168cb..37d114605 100644
--- a/adb/commandline.cpp
+++ b/adb/commandline.cpp
@@ -1106,8 +1106,9 @@ static int send_shell_command(TransportType transport_type, const char* serial,
         }
 
         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);