[Android] Remove android_commands uses from build/android/.

build/android/pylib/device/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).
 """
 
 import collections
 import errno
 import logging
 import os
 
 from pylib import cmd_helper
 from pylib import constants
 from pylib.device import decorators
 from pylib.device import device_errors
+from pylib.device import device_filter
 from pylib.utils import timeout_retry
 
 
 _DEFAULT_TIMEOUT = 30
 _DEFAULT_RETRIES = 2
 
 
 def _VerifyLocalFileExists(path):
   """Verifies a local file exists.
 
@@ skipping 121 matching lines @@
   @classmethod
   def KillServer(cls, timeout=_DEFAULT_TIMEOUT, retries=_DEFAULT_RETRIES):
     cls._RunAdbCmd(['kill-server'], timeout=timeout, retries=retries)
 
   @classmethod
   def StartServer(cls, timeout=_DEFAULT_TIMEOUT, retries=_DEFAULT_RETRIES):
     # CPU affinity is used to reduce adb instability http://crbug.com/268450
     cls._RunAdbCmd(['start-server'], timeout=timeout, retries=retries,
                    cpu_affinity=0)
 
-  # TODO(craigdh): Determine the filter criteria that should be supported.
   @classmethod
-  def GetDevices(cls, timeout=_DEFAULT_TIMEOUT, retries=_DEFAULT_RETRIES):
+  def GetDevices(cls, filters=None, timeout=_DEFAULT_TIMEOUT,
+                 retries=_DEFAULT_RETRIES):
+    """DEPRECATED. Refer to Devices(...) below."""
+    # TODO(jbudorick): Remove this function once no more clients are using it.
+    return cls.Devices(filters=filters, timeout=timeout, retries=retries)
+
+  @classmethod
+  def Devices(cls, filters=None, timeout=_DEFAULT_TIMEOUT,
+              retries=_DEFAULT_RETRIES):
     """Get the list of active attached devices.
 
     Args:
+      filters: (optional) A list of binary functions that take an AdbWrapper
+          instance and a string description. Any device for which all provided
+          filter functions do not return True will not be included in the
+          returned list.
       timeout: (optional) Timeout per try in seconds.
       retries: (optional) Number of retries to attempt.
 
     Yields:
       AdbWrapper instances.
     """
     output = cls._RunAdbCmd(['devices'], timeout=timeout, retries=retries)
-    lines = [line.split() for line in output.splitlines()]
-    return [AdbWrapper(line[0]) for line in lines
-            if len(line) == 2 and line[1] == 'device']
+    lines = (line.split() for line in output.splitlines())
+    devices = (AdbWrapper(line[0]) for line in lines if len(line) == 2)
+
+    def matches_all_filters(device):
+      for f in filters:
+        if not f(device):
+          logging.info('Device %s failed filter %s', device.GetDeviceSerial(),
+                       f.__name__)
+          return False
+      return True
+
+    return [d for d in devices if matches_all_filters(d)]
 
   def GetDeviceSerial(self):
     """Gets the device serial number associated with this object.
 
     Returns:
       Device serial number as a string.
     """
     return self._device_serial
 
   def Push(self, local, remote, timeout=60*5, retries=_DEFAULT_RETRIES):
@@ skipping 336 matching lines @@
     """Restarts the adbd daemon with root permissions, if possible.
 
     Args:
       timeout: (optional) Timeout per try in seconds.
       retries: (optional) Number of retries to attempt.
     """
     output = self._RunDeviceAdbCmd(['root'], timeout, retries)
     if 'cannot' in output:
       raise device_errors.AdbCommandFailedError(
           ['root'], output, device_serial=self._device_serial)