commit 4f3fd04cd15e7190618dbdf4413656ab283e9434
author android-build-prod (mdb) <android-build-team-robot@google.com> Tue May 01 19:00:15 2018 -0700
committer android-build-merger <android-build-merger@google.com> Tue May 01 19:00:15 2018 -0700
tree ffec3a7b398fd6922ae4d0127a17ec0aa0c3aa4a
parent 83d7ef4a7c947e3344c4233959777f44ce3e4c64
parent 142eeae5461130e1c33583a852077add44d6b3bb

Merge "adb: Avoid waiting for emulator connections" am: 8ef8d1eb6b
am: 142eeae546

Change-Id: I4d9a888b7d7521ad0428aa33af6d24143818162b

adb/transport.cpp

diff --git a/adb/transport.cpp b/adb/transport.cpp
index 706aee6..fa7cc8c 100644
--- a/adb/transport.cpp
+++ b/adb/transport.cpp
@@ -1040,6 +1040,11 @@
     auto waitable = t->connection_waitable();
     register_transport(t);
 
+    if (local == 1) {
+        // Do not wait for emulator transports.
+        return 0;
+    }
+
     return waitable->WaitForConnection(std::chrono::seconds(10)) ? 0 : -1;
 }