| commit | b80ed9069623efa3d48ac318c2c7585882d9b5d1 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Mon Jun 29 22:32:19 2015 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Mon Jun 29 22:32:19 2015 +0000 |
| tree | fe1ae4ed159ff84433c658bcdac2864b46daa389 | |
| parent | 692dc75d9fbf5c256cd8c66219a930ae0fe9f523 [diff] | |
| parent | 3abd31d8f4b4a86297ecc619ce746e660cb59028 [diff] |
Merge "adb server: don't close stale fd when TCP transport is closed"
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); + } }