| commit | 520dcf39bf495614b86887b12d2a4cb6ee5e07ce | [log] [tgz] |
|---|---|---|
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | Tue May 01 18:55:31 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Tue May 01 18:55:31 2018 -0700 |
| tree | a3a47e5ee8255d203436d1e156c71fd20811bb66 | |
| parent | 52dc8c7958ccb6b2198f65be3f00862167ad7e41 [diff] | |
| parent | 687d4d757892fa34183d0425bdda839fb24d0341 [diff] |
Merge "adb: Avoid waiting for emulator connections" am: 8ef8d1eb6b Change-Id: I3720cad78b1d8449c3e1cfedc57bc3c673c73b80
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; }