| Index: build/android/pylib/local/device/local_device_environment.py
|
| diff --git a/build/android/pylib/local/device/local_device_environment.py b/build/android/pylib/local/device/local_device_environment.py
|
| index 4a0d5672173da57826b3d9d8ed36befe13d9defa..04f9ab7d2fead494c5d90759e30ae90b048fc0e8 100644
|
| --- a/build/android/pylib/local/device/local_device_environment.py
|
| +++ b/build/android/pylib/local/device/local_device_environment.py
|
| @@ -4,7 +4,6 @@
|
|
|
| from pylib.base import environment
|
| from pylib.device import adb_wrapper
|
| -from pylib.device import device_blacklist
|
| from pylib.device import device_errors
|
| from pylib.device import device_utils
|
| from pylib.utils import parallelizer
|
| @@ -14,8 +13,6 @@
|
|
|
| def __init__(self, args, _error_func):
|
| super(LocalDeviceEnvironment, self).__init__()
|
| - self._blacklist = device_blacklist.Blacklist(
|
| - args.blacklist_file or device_blacklist.BLACKLIST_JSON)
|
| self._device_serial = args.test_device
|
| self._devices = []
|
| self._max_tries = 1 + args.num_retries
|
| @@ -23,8 +20,7 @@
|
|
|
| #override
|
| def SetUp(self):
|
| - available_devices = device_utils.DeviceUtils.HealthyDevices(
|
| - self._blacklist)
|
| + available_devices = device_utils.DeviceUtils.HealthyDevices()
|
| if not available_devices:
|
| raise device_errors.NoDevicesError
|
| if self._device_serial:
|
|
|