swarming: Roll py-adb to 75477ebf4fb8b906707f35e5fb385a9203256bef

appengine/third_party/python-adb/adb/contrib/high.py

 # coding=utf-8
 # Copyright 2015 Google Inc. All rights reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
@@ skipping 284 matching lines @@
   - on_error: callback when an internal failure occurs.
   - as_root: if True, restarts adbd as root if possible.
 
   Returns one of:
     - list of HighDevice instances.
     - None if adb is unavailable.
   """
   with _ADB_KEYS_LOCK:
     if not _ADB_KEYS:
       return []
+
+  # Skip devices that don't expose a serial number.
+  device_matcher = lambda device: device.serial_number is not None
+
   # Create unopened handles for all usb devices.
   handles = list(
       common.UsbHandle.FindDevicesSafe(
-          adb_commands_safe.DeviceIsAvailable, timeout_ms=default_timeout_ms))
+          adb_commands_safe.DeviceIsAvailable, timeout_ms=default_timeout_ms,
+          device_matcher=device_matcher))
 
   return _ConnectFromHandles(handles, banner=banner,
                              default_timeout_ms=default_timeout_ms,
                              auth_timeout_ms=auth_timeout_ms, on_error=on_error,
                              as_root=as_root, enable_resets=enable_resets)
 
 
 def GetRemoteDevices(banner, endpoints, default_timeout_ms, auth_timeout_ms,
                      on_error=None, as_root=False):
   """Returns the list of devices available.
@@ skipping 683 matching lines @@
     return out
 
   @classmethod
   def _Connect(cls, constructor, **kwargs):
     """Called by either ConnectDevice or Connect."""
     if not kwargs.get('rsa_keys'):
       with _ADB_KEYS_LOCK:
         kwargs['rsa_keys'] = _ADB_KEYS[:]
     device = constructor(**kwargs)
     return HighDevice(device, _InitCache(device))