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

Commit a41a0c2a authored by Josh Gao's avatar Josh Gao Committed by android-build-merger
Browse files

Merge "adb: use asocket\'s close function when closing." am: 684d5439 

am: 43c058e5

* commit '43c058e5':
  adb: use asocket's close function when closing.

Change-Id: I0681ff8c31c2f221e246a86857fbff779d2b7dcf
parents dccd3a36 43c058e5

adb/sockets.cpp

+1 −3
Original line number Diff line number Diff line
@@ -39,8 +39,6 @@ 
#include "sysdeps/mutex.h"

#include "transport.h"



static void local_socket_close(asocket* s);



static std::recursive_mutex& local_socket_list_lock = *new std::recursive_mutex();

static unsigned local_socket_next_id = 1;
@@ -118,7 +116,7 @@ void close_all_sockets(atransport* t) { 
restart:

    for (s = local_socket_list.next; s != &local_socket_list; s = s->next) {

        if (s->transport == t || (s->peer && s->peer->transport == t)) {

            local_socket_close(s);

            s->close(s);

            goto restart;

        }

    }