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

Commit f03aa667 authored by Yabin Cui's avatar Yabin Cui Committed by Android Git Automerger
Browse files

am fbdd5ee2: Merge "adb: keep all asocket operations in the main thread." 

* commit 'fbdd5ee2':
  adb: keep all asocket operations in the main thread.
parents 63141512 fbdd5ee2

adb/adb.cpp

+5 −0
Original line number Diff line number Diff line
@@ -243,6 +243,11 @@ void handle_offline(atransport *t) 
    D("adb: offline\n");

    //Close the associated usb

    t->online = 0;



    // This is necessary to avoid a race condition that occured when a transport closes

    // while a client socket is still active.

    close_all_sockets(t);



    run_transport_disconnects(t);

}

adb/transport.cpp

+0 −4
Original line number Diff line number Diff line
@@ -330,10 +330,6 @@ static void *input_thread(void *_t) 
        put_apacket(p);

    }



    // this is necessary to avoid a race condition that occured when a transport closes

    // while a client socket is still active.

    close_all_sockets(t);



    D("%s: transport input thread is exiting, fd %d\n", t->serial, t->fd);

    kick_transport(t);

    transport_unref(t);