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

Commit e5867141 authored by Scott Anderson's avatar Scott Anderson Committed by Android Git Automerger
Browse files

am 3608d832: adb: Fix two problems with device path implementation. 

* commit '3608d832':
  adb: Fix two problems with device path implementation.
parents a1020825 3608d832

adb/sockets.c

+4 −0
Original line number Diff line number Diff line
@@ -615,6 +615,10 @@ unsigned unhex(unsigned char *s, int len) 
char *skip_host_serial(char *service) {

    char *first_colon, *serial_end;



    if (!strncmp(service, "usb:", 4)) {

        return strchr(service + 4, ':');

    }



    first_colon = strchr(service, ':');

    if (!first_colon) {

        /* No colon in service string. */

adb/transport.c

+0 −3
Original line number Diff line number Diff line
@@ -923,9 +923,6 @@ atransport *find_transport(const char *serial) 
        if (t->serial && !strcmp(serial, t->serial)) {

            break;

        }

        if (t->devpath && !strcmp(serial, t->devpath)) {

            break;

        }

     }

    adb_mutex_unlock(&transport_lock);