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 976399cfa35fa1222f4243b0076870b5ffc4585a..472481621c3dab598ef5007a0888f3058c637140 100644 |
--- a/build/android/pylib/device/device_utils.py |
+++ b/build/android/pylib/device/device_utils.py |
@@ -216,6 +216,22 @@ class DeviceUtils(object): |
"""Returns the device serial.""" |
return self.adb.GetDeviceSerial() |
+ @property |
+ def default_timeout(self): |
+ return self._default_timeout |
+ |
+ @default_timeout.setter |
jbudorick
2015/08/27 00:37:37
nix the setters.
agrieve
2015/08/27 03:20:00
whoops, done.
|
+ def default_timeout(self, value): |
+ self._default_timeout = value |
+ |
+ @property |
+ def default_retries(self): |
+ return self._default_retries |
+ |
+ @default_retries.setter |
+ def default_retries(self, value): |
+ self._default_retries = value |
+ |
@decorators.WithTimeoutAndRetriesFromInstance() |
def IsOnline(self, timeout=None, retries=None): |
"""Checks whether the device is online. |
@@ -1869,7 +1885,7 @@ class DeviceUtils(object): |
return parallelizer.SyncParallelizer(devices) |
@classmethod |
- def HealthyDevices(cls): |
+ def HealthyDevices(cls, **kwargs): |
blacklist = device_blacklist.ReadBlacklist() |
def blacklisted(adb): |
if adb.GetDeviceSerial() in blacklist: |
@@ -1877,7 +1893,7 @@ class DeviceUtils(object): |
return True |
return False |
- return [cls(adb) for adb in adb_wrapper.AdbWrapper.Devices() |
+ return [cls(adb, **kwargs) for adb in adb_wrapper.AdbWrapper.Devices() |
if not blacklisted(adb)] |
@decorators.WithTimeoutAndRetriesFromInstance() |