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
This commit is contained in:
Elliott Hughes 2015-06-29 22:59:23 +00:00 committed by Android Git Automerger
commit 1bb6a4b89e

View file

@ -331,7 +331,11 @@ static void remote_kick(atransport *t)
static void remote_close(atransport *t)
{
adb_close(t->fd);
int fd = t->sfd;
if (fd != -1) {
t->sfd = -1;
adb_close(fd);
}
}