ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
am: 142eeae546

Change-Id: I4d9a888b7d7521ad0428aa33af6d24143818162b
This commit is contained in:
android-build-prod (mdb) 2018-05-01 19:00:15 -07:00 • committed by android-build-merger
commit 4f3fd04cd1
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
adb/transport.cpp
View file

@ -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;
}