commit 6b71862df1f3d37798b6a5e631b68f50e220620e
author Josh Gao <jmgao@google.com> Thu Jan 07 01:25:11 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jan 07 01:25:11 2016 +0000
tree 3efb3d114b9c1c1e9497d3211dcfd0232f901096
parent 414f91005fbfb068385b20d6709a12e9002cb5e5
parent ddacce2050bed51757aa028bb95f9d00f8838616

Merge "WA: Fix adb wait-for-device command"
am: bf867cac7e

* commit 'bf867cac7eac5e43b6a1b0157800f9ad09a711b9':
  WA: Fix adb wait-for-device command

adb/services.cpp

diff --git a/adb/services.cpp b/adb/services.cpp
index 20166ce..cd33e7b 100644
--- a/adb/services.cpp
+++ b/adb/services.cpp
@@ -368,8 +368,9 @@
     while (true) {
         bool is_ambiguous = false;
         std::string error = "unknown error";
-        atransport* t = acquire_one_transport(sinfo->transport_type, sinfo->serial.c_str(),
-                                              &is_ambiguous, &error);
+        const char* serial = sinfo->serial.length() ? sinfo->serial.c_str() : NULL;
+        atransport* t = acquire_one_transport(sinfo->transport_type, serial, &is_ambiguous, &error);
+
         if (t != nullptr && t->connection_state == sinfo->state) {
             SendOkay(fd);
             break;