commit 168f7049e91663165dce9d62e748b09b09f04ec4
author Elliott Hughes <enh@google.com> Mon Jun 29 22:59:23 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 29 22:59:23 2015 +0000
tree 3df1419316584d00d8ba1b8e50b456756b7f169d
parent 1c2dd74826ca7ffd4382912161a11dcc7285958d
parent aedbaff511e82f4df6e63084f35b528ade0c165b

am eb73219c: am b80ed906: Merge "adb server: don\'t close stale fd when TCP transport is closed"

* commit 'eb73219cbe186c4d879df081a83a97afa3ff7fc9':
  adb server: don't close stale fd when TCP transport is closed

adb/transport_local.cpp

diff --git a/adb/transport_local.cpp b/adb/transport_local.cpp
index d3c4c30..97e3d50 100644
--- a/adb/transport_local.cpp
+++ b/adb/transport_local.cpp
@@ -331,7 +331,11 @@
 
 static void remote_close(atransport *t)
 {
-    adb_close(t->fd);
+    int fd = t->sfd;
+    if (fd != -1) {
+        t->sfd = -1;
+        adb_close(fd);
+    }
 }