commit 86d778e2284e200c940ccde704cdaa5e0b60cc34
author Elliott Hughes <enh@google.com> Mon Jun 29 23:07:18 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 29 23:07:18 2015 +0000
tree a50db3d211e37f77018a4b478a434e81d82064a3
parent de1d7017133b4ead07d0156d836c026d34d8f198
parent 168f7049e91663165dce9d62e748b09b09f04ec4

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

* commit '1bb6a4b89ed9fbba6d73ee8e716c3e9847feaefa':
  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);
+    }
 }