ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Allow multiple tcp adb connection to same device." am: 4818194a25

Browse source 
am: e060cdadc8

Change-Id: I62c8f1c466de213c25cd36d03b3b6d7c0a71b989
This commit is contained in:
Elliott Hughes 2016-10-24 23:41:15 +00:00 • committed by android-build-merger
commit 2337e51f11
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
adb/transport_local.cpp
View file

@ -226,7 +226,8 @@ static void server_socket_thread(void* arg) {
D("server: new connection on fd %d", fd);
close_on_exec(fd);
disable_tcp_nagle(fd);
if (register_socket_transport(fd, "host", port, 1) != 0) {
std::string serial = android::base::StringPrintf("host-%d", fd);
if (register_socket_transport(fd, serial.c_str(), port, 1) != 0) {
adb_close(fd);
}
}