commit c2612cd775e2c0c975f6250ddf0ac7f809b3d015
author Daniel Colascione <dancol@google.com> Wed Nov 13 17:51:19 2019 -0800
committer Daniel Colascione <dancol@google.com> Fri Mar 27 20:51:19 2020 +0000
tree 7dc4ce9688328ac694b9d53e0e4f85131da44e01
parent 44a6d9a527841980bca25b65f630b15f163c8a50

Revert "Revert "Delay initial accept() until server initialized""

This reverts commit b71b5af7836c29a08678203043bec658bf07e584.

Test: actually build device and host adb this time
Change-Id: I9f9375aa83c9d023a1e26d2f95676b734e12f926

adb/adb.cpp

diff --git a/adb/adb.cpp b/adb/adb.cpp
index 98db191..b514368 100644
--- a/adb/adb.cpp
+++ b/adb/adb.cpp
@@ -1016,8 +1016,12 @@
         if (kill_forward) {
             r = remove_listener(pieces[0].c_str(), transport);
         } else {
-            r = install_listener(pieces[0], pieces[1].c_str(), transport, no_rebind,
-                                 &resolved_tcp_port, &error);
+            int flags = 0;
+            if (no_rebind) {
+                flags |= INSTALL_LISTENER_NO_REBIND;
+            }
+            r = install_listener(pieces[0], pieces[1].c_str(), transport, flags, &resolved_tcp_port,
+                                 &error);
         }
         if (r == INSTALL_STATUS_OK) {
 #if ADB_HOST