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

Commit 05d6a649 authored by Benoit Goby's avatar Benoit Goby Committed by Android Git Automerger
Browse files

am 9f25178a: am 7f8fb3ff: Merge "adb: Prevent registering usb_disconnect twice" into jb-mr2-dev 

* commit '9f25178a':
  adb: Prevent registering usb_disconnect twice
parents 9ee72b0b 9f25178a

adb/adb_auth_client.c

+6 −4
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ int adb_auth_verify(void *token, void *sig, int siglen) 


static void usb_disconnected(void* unused, atransport* t)

{

    D("USB disconnect");

    D("USB disconnect\n");

    remove_transport_disconnect(usb_transport, &usb_disconnect);

    usb_transport = NULL;

    needs_retry = false;
@@ -175,7 +175,7 @@ static void adb_auth_event(int fd, unsigned events, void *data) 
    if (events & FDE_READ) {

        ret = unix_read(fd, response, sizeof(response));

        if (ret < 0) {

            D("Framework disconnect");

            D("Framework disconnect\n");

            if (usb_transport)

                fdevent_remove(&usb_transport->auth_fde);

            framework_fd = -1;
@@ -192,8 +192,10 @@ void adb_auth_confirm_key(unsigned char *key, size_t len, atransport *t) 
    char msg[MAX_PAYLOAD];

    int ret;



    if (!usb_transport) {

        usb_transport = t;

        add_transport_disconnect(t, &usb_disconnect);

    }



    if (framework_fd < 0) {

        D("Client not connected\n");