Merge pull request dtmilano#261 from divankov/qualifier_as_transport

dtmilano · web-flow · commit 0da5f3b1058d · 2018-10-31T22:58:01.000-07:00
Keep adbclient.serialno intact if it's a valid transport name.
diff --git a/src/com/dtmilano/android/adb/adbclient.py b/src/com/dtmilano/android/adb/adbclient.py
@@ -416,7 +416,9 @@ def __setTransport(self, timeout=60):
                             device = Device.factory(line[4:])
                             if device.status == 'device':
                                 devices.append(device)
+                                # this looks like a bug, we skip serialno matching here
                                 found = True
+                                self.serialno = device.serialno
                                 break
                         if found:
                             break
@@ -437,12 +439,22 @@ def __setTransport(self, timeout=60):
         if len(devices) == 0:
             raise RuntimeError("ERROR: There are no connected devices")
         for device in devices:
-            if serialnoRE.match(device.serialno) or device.has_qualifier(self.serialno):
+            if serialnoRE.match(device.serialno):
+                found = True
+                # self.serialno could've been a regexp, we can't feed that to adb as a transport
+                self.serialno = device.serialno
+                break
+            if device.has_qualifier(self.serialno):
+                # self.serialno is a proper transport value, it could be more specific than device.serialno
+                # For instance devpath/usbpath specifies exactly one device, while serialno might be the same
+                # for reflashed devices.
+                # The only flipside here is that we fail to pick one (first/random) device from possibly many
+                # having the same qualifier (product: model: or device:) if they have different serials.
+                # This could be fixed by some custom logic or using host:transport-id: support in newer and.
                 found = True
                 break
         if not found:
             raise RuntimeError("ERROR: couldn't find device that matches '%s' in %s" % (self.serialno, devices))
-        self.serialno = device.serialno
         msg = 'host:transport:%s' % self.serialno
         if DEBUG:
             print >> sys.stderr, "    __setTransport: msg=", msg
