Index: build/android/pylib/android_commands.py |
diff --git a/build/android/pylib/android_commands.py b/build/android/pylib/android_commands.py |
index 4cba47a296adca741d45037c5e164ca4bfe59e97..0102997be118e0d57b2475e6911f23a4191d8416 100644 |
--- a/build/android/pylib/android_commands.py |
+++ b/build/android/pylib/android_commands.py |
@@ -135,7 +135,7 @@ def GetAttachedDevices(hardware=True, emulator=True, offline=False): |
def IsDeviceAttached(device): |
"""Return true if the device is attached and online.""" |
- return device in GetAttachedDevices() |
+ return device in GetAttachedDevices(emulator=True) |
frankf
2013/07/22 22:43:13
Why is this needed?
navabi
2013/07/22 23:11:05
It's called by /src/build/android/pylib/base/test_
frankf
2013/07/22 23:19:44
why emulator=True is needed? It's the default.
On
navabi
2013/07/22 23:44:07
Done.
|
def _GetFilesFromRecursiveLsOutput(path, ls_output, re_file, utc_offset=None): |
@@ -1015,7 +1015,7 @@ class AndroidCommands(object): |
def GetWifiIP(self): |
"""Returns the wifi IP on the device.""" |
wifi_ip = self.RunShellCommand('getprop dhcp.wlan0.ipaddress')[0] |
- assert wifi_ip |
+ # Do not assert here. Devices (e.g. emulators) may not have a WifiIP. |
return wifi_ip |
def GetSubscriberInfo(self): |