Commit eb73219c authored Jun 29, 2015 by Elliott Hughes Committed by Android Git Automerger Jun 29, 2015

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

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

adb/transport_local.cpp

+5 −1

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}