| 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 c318b69928c28fd3e47ca038b26b5f8b29e0ac99..5be914cdbdaae803747c576581a672ff53416aed 100644
|
| --- a/build/android/devil/android/device_utils.py
|
| +++ b/build/android/devil/android/device_utils.py
|
| @@ -25,6 +25,7 @@
|
| from devil.android import apk_helper
|
| from devil.android import device_signal
|
| from devil.android import decorators
|
| +from devil.android import device_blacklist
|
| from devil.android import device_errors
|
| from devil.android import device_temp_file
|
| from devil.android import logcat_monitor
|
| @@ -1931,7 +1932,11 @@
|
|
|
| @classmethod
|
| def HealthyDevices(cls, blacklist=None, **kwargs):
|
| - blacklisted_devices = blacklist.Read() if blacklist else []
|
| + if not blacklist:
|
| + # TODO(jbudorick): Remove once clients pass in the blacklist.
|
| + blacklist = device_blacklist.Blacklist(device_blacklist.BLACKLIST_JSON)
|
| +
|
| + blacklisted_devices = blacklist.Read()
|
| def blacklisted(adb):
|
| if adb.GetDeviceSerial() in blacklisted_devices:
|
| logging.warning('Device %s is blacklisted.', adb.GetDeviceSerial())
|
|
|