Index: build/android/pylib/device/adb_wrapper.py |
diff --git a/build/android/pylib/device/adb_wrapper.py b/build/android/pylib/device/adb_wrapper.py |
index 1e07c53734dd439c73f04ce8e12b712268be8c60..d081d133ebddafc4900ea7d2ce74b993b88b56c0 100644 |
--- a/build/android/pylib/device/adb_wrapper.py |
+++ b/build/android/pylib/device/adb_wrapper.py |
@@ -170,13 +170,13 @@ class AdbWrapper(object): |
return cls.Devices(timeout=timeout, retries=retries) |
@classmethod |
- def Devices(cls, is_ready=True, long_list=False, timeout=_DEFAULT_TIMEOUT, |
- retries=_DEFAULT_RETRIES): |
+ def Devices(cls, desired_state=_READY_STATE, long_list=False, |
rnephew (Wrong account)
2015/08/21 02:25:12
Is is_ready used anywhere else that isn't changed
jbudorick
2015/08/21 02:27:38
same name, mocking a function in AdbWrapper rather
|
+ timeout=_DEFAULT_TIMEOUT, retries=_DEFAULT_RETRIES): |
"""Get the list of active attached devices. |
Args: |
- is_ready: Whether the devices should be limited to only those that are |
- ready for use. |
+ desired_state: If not None, limit the devices returned to only those |
+ in the given state. |
long_list: Whether to use the long listing format. |
timeout: (optional) Timeout per try in seconds. |
retries: (optional) Number of retries to attempt. |
@@ -188,7 +188,7 @@ class AdbWrapper(object): |
retries=retries) |
return [AdbWrapper(line[0]) for line in lines |
if ((long_list or len(line) == 2) |
- and (not is_ready or line[1] == _READY_STATE))] |
+ and (not desired_state or line[1] == desired_state))] |
@classmethod |
def _RawDevices(cls, long_list=False, timeout=_DEFAULT_TIMEOUT, |