Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a4fa8778 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

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

am: 2337e51f

Change-Id: I6b450fe6704a3e0497abc1bc5edf251a8c2c025c
parents b69404f3 2337e51f

adb/transport_local.cpp

+2 −1
Original line number Diff line number Diff line
@@ -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);

            }

        }