commit e5867141c9364596fbcd47195aeff5b0f9844435
author Scott Anderson <saa@android.com> Fri Jun 01 11:08:08 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 01 11:08:08 2012 -0700
tree a661569aa28397eb127d5fe957e122530709071e
parent a1020825fb8abdff9289a7473260e5312131e7c8
parent 3608d832425ca3a6d00c4040f3bb979c5aa49899

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

* commit '3608d832425ca3a6d00c4040f3bb979c5aa49899':
  adb: Fix two problems with device path implementation.

adb/sockets.c

diff --git a/adb/sockets.c b/adb/sockets.c
index 91db951..cad107f 100644
--- a/adb/sockets.c
+++ b/adb/sockets.c
@@ -615,6 +615,10 @@
 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

diff --git a/adb/transport.c b/adb/transport.c
index 29cb582..d99d591 100644
--- a/adb/transport.c
+++ b/adb/transport.c
@@ -923,9 +923,6 @@
         if (t->serial && !strcmp(serial, t->serial)) {
             break;
         }
-        if (t->devpath && !strcmp(serial, t->devpath)) {
-            break;
-        }
      }
     adb_mutex_unlock(&transport_lock);