| Index: build/android/pylib/device/device_utils.py
|
| diff --git a/build/android/pylib/device/device_utils.py b/build/android/pylib/device/device_utils.py
|
| index fbcae02b08014c21c5c4ace242b930ba439cb850..5db1eeeb83ee41c63f9974c841287a8eae1d238d 100644
|
| --- a/build/android/pylib/device/device_utils.py
|
| +++ b/build/android/pylib/device/device_utils.py
|
| @@ -30,7 +30,6 @@
|
| from pylib.device import decorators
|
| from pylib.device import device_blacklist
|
| from pylib.device import device_errors
|
| -from pylib.device import device_filter
|
| from pylib.device import intent
|
| from pylib.device import logcat_monitor
|
| from pylib.device.commands import install_commands
|
| @@ -1528,8 +1527,9 @@
|
| A Parallelizer operating over |devices|.
|
| """
|
| if not devices:
|
| - devices = adb_wrapper.AdbWrapper.Devices(
|
| - filters=device_filter.DefaultFilters())
|
| + blacklist = device_blacklist.ReadBlacklist()
|
| + devices = [d for d in adb_wrapper.AdbWrapper.GetDevices()
|
| + if d.GetDeviceSerial() not in blacklist]
|
| if not devices:
|
| raise device_errors.NoDevicesError()
|
|
|
|
|