commit aedbaff511e82f4df6e63084f35b528ade0c165b
author Elliott Hughes <enh@google.com> Mon Jun 29 22:49:03 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Jun 29 22:49:03 2015 +0000
tree fe1ae4ed159ff84433c658bcdac2864b46daa389
parent be1ad732e3b8d0ce53208dd2554a6fea98f22583
parent 2749dc23f6006bf8902ad6333fe12a1a3c9281e0

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

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