[devil] Allow instantiation of AdbWrapper with USB bus identifer.

devil/devil/android/sdk/adb_wrapper.py

 # Copyright 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """This module wraps Android's adb tool.
 
 This is a thin wrapper around the adb interface. Any additional complexity
 should be delegated to a higher level (ex. DeviceUtils).
 """
 
@@ skipping 93 matching lines @@
   original command in them, that is what it detects ror.
 
   Args:
       line: Output line to check.
       send_cmd: Command that was sent to adb persistent shell.
   """
   return send_cmd.rstrip() in line
 
 
 class AdbWrapper(object):
-  """A wrapper around a local Android Debug Bridge executable."""
+  """A wrapper around a local Android Debug Bridge executable.
+
+  WARNING: Not all features are supported when using a USB ID.
+  """
 
   _adb_path = lazy.WeakConstant(_FindAdb)
   _adb_version = lazy.WeakConstant(_GetVersion)
 
   def __init__(self, device_serial):
     """Initializes the AdbWrapper.
 
     Args:
-      device_serial: The device serial number as a string.
+      device_serial: The device serial number or USB bus ID as a string.
+
     """
     if not device_serial:
       raise ValueError('A device serial must be specified')
+
+    # TODO: Improve support for instances created from a USB ID.
+    if "usb:" in device_serial:
+      logger.warning("Not all features are supported when using a USB ID.")
+
     self._device_serial = str(device_serial)
 
   class PersistentShell(object):
     '''Class to use persistent shell for ADB.
 
     This class allows a persistent ADB shell to be created, where multiple
     commands can be passed into it. This avoids the overhead of starting
     up a new ADB shell for each command.
 
     Example of use:
@@ skipping 680 matching lines @@
     self._RunDeviceAdbCmd(['wait-for-device'], timeout, retries)
 
   def GetState(self, timeout=DEFAULT_TIMEOUT, retries=DEFAULT_RETRIES):
     """Get device state.
 
     Args:
       timeout: (optional) Timeout per try in seconds.
       retries: (optional) Number of retries to attempt.
 
     Returns:
-      One of 'offline', 'bootloader', or 'device'.
+        One of 'offline', 'bootloader', or 'unauthorized', or
+        'no' [permissions], or 'device'
     """
     # TODO(jbudorick): Revert to using get-state once it doesn't cause a
     # a protocol fault.
     # return self._RunDeviceAdbCmd(['get-state'], timeout, retries).strip()
 
-    lines = self._RawDevices(timeout=timeout, retries=retries)
+    lines = self._RawDevices(timeout=timeout, retries=retries, long_list=True)
     for line in lines:
-      if len(line) >= 2 and line[0] == self._device_serial:
+      if len(line) >= 3 and (line[0] == self._device_serial or line[2] ==
+        self._device_serial):
         return line[1]
     return 'offline'
 
   def GetDevPath(self, timeout=DEFAULT_TIMEOUT, retries=DEFAULT_RETRIES):
     """Gets the device path.
 
     Args:
       timeout: (optional) Timeout per try in seconds.
       retries: (optional) Number of retries to attempt.
 
@@ skipping 68 matching lines @@
   @property
   def is_emulator(self):
     return _EMULATOR_RE.match(self._device_serial)
 
   @property
   def is_ready(self):
     try:
       return self.GetState() == _READY_STATE
     except device_errors.CommandFailedError:
       return False