commit 5d3958525543d4be02c4530dba9aab964623755d
author Luis Hector Chavez <lhchavez@google.com> Tue Apr 17 14:09:21 2018 -0700
committer Luis Hector Chavez <lhchavez@google.com> Tue Apr 17 14:36:33 2018 -0700
tree 1833412eaffcf5c625545ca2fe3028055363f2bd
parent ca10ecb3aed00a146e9b3b35549d36797427eb88

adb: Distinguish betwen already-connected and connection failure

This change returns a different value (-EALREADY) when a connection has
already been established, as opposed to a real connection failure (which
still returns -1).

Bug: 74411879
Test: Opened a socket, tried to adb connect to it,
      got "failed to connect to localhost:1337"

Change-Id: Ic216ddef7f28eb43ca750f9e51d068c077d54b07

adb/transport.cpp

diff --git a/adb/transport.cpp b/adb/transport.cpp
index 92c52e2..f5f6d26 100644
--- a/adb/transport.cpp
+++ b/adb/transport.cpp
@@ -974,7 +974,7 @@
             VLOG(TRANSPORT) << "socket transport " << transport->serial
                             << " is already in pending_list and fails to register";
             delete t;
-            return -1;
+            return -EALREADY;
         }
     }
 
@@ -983,7 +983,7 @@
             VLOG(TRANSPORT) << "socket transport " << transport->serial
                             << " is already in transport_list and fails to register";
             delete t;
-            return -1;
+            return -EALREADY;
         }
     }