Merge "adb: Avoid waiting for emulator connections" (142eeae5) · Commits · e / os / android_system_core

adb/transport.cpp

+5 −0

Original line number	Diff line number	Diff line
		@@ -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;
		}