| Index: build/android/devil/android/device_utils.py
|
| diff --git a/build/android/devil/android/device_utils.py b/build/android/devil/android/device_utils.py
|
| index c35bc264ef9e48da1cfbcb10aa4df75fbaf2c42f..ce653cdbd4f42cf5c6e3617c108356b5fa3f5547 100644
|
| --- a/build/android/devil/android/device_utils.py
|
| +++ b/build/android/devil/android/device_utils.py
|
| @@ -1913,11 +1913,7 @@ class DeviceUtils(object):
|
|
|
| @classmethod
|
| def HealthyDevices(cls, blacklist=None, **kwargs):
|
| - if not blacklist:
|
| - # TODO(jbudorick): Remove once clients pass in the blacklist.
|
| - blacklist = device_blacklist.Blacklist(device_blacklist.BLACKLIST_JSON)
|
| -
|
| - blacklisted_devices = blacklist.Read()
|
| + blacklisted_devices = blacklist.Read() if blacklist else []
|
| def blacklisted(adb):
|
| if adb.GetDeviceSerial() in blacklisted_devices:
|
| logging.warning('Device %s is blacklisted.', adb.GetDeviceSerial())
|
|
|