| commit | 8ef8d1eb6ba51d382fb4b6886b3d497ac2a45973 | [log] [tgz] |
|---|---|---|
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | Wed May 02 01:46:12 2018 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed May 02 01:46:12 2018 +0000 |
| tree | a3a47e5ee8255d203436d1e156c71fd20811bb66 | |
| parent | 49b7f296b9e513b69fa60088e03a70cb354a3120 [diff] | |
| parent | c587f02cc689c9cf55c51c266175a63165047fd7 [diff] |
Merge "adb: Avoid waiting for emulator connections"
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; }