Merge "adb: Avoid waiting for emulator connections"

am: 8ef8d1eb6b

Change-Id: I3720cad78b1d8449c3e1cfedc57bc3c673c73b80

adb/transport.cpp

@@ -1040,6 +1040,11 @@ int register_socket_transport(int s, const char* serial, int port, int local) {
     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;
 }