Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1113)

Unified Diff: build/android/pylib/utils/emulator.py

Issue 19774008: Do not reboot emulator. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed nits. Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/pylib/android_commands.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/utils/emulator.py
diff --git a/build/android/pylib/utils/emulator.py b/build/android/pylib/utils/emulator.py
index 226956f073aab79885894d346812b1fe5ab88844..f5838353d55fea72816466cd5854a41c75161308 100755
--- a/build/android/pylib/utils/emulator.py
+++ b/build/android/pylib/utils/emulator.py
@@ -47,14 +47,14 @@ def _KillAllEmulators():
running but a device slot is taken. A little bot trouble and and
we're out of room forever.
"""
- emulators = android_commands.GetEmulators()
+ emulators = android_commands.GetAttachedDevices(hardware=False)
if not emulators:
return
for emu_name in emulators:
cmd_helper.RunCmd(['adb', '-s', emu_name, 'emu', 'kill'])
logging.info('Emulator killing is async; give a few seconds for all to die.')
for i in range(5):
- if not android_commands.GetEmulators():
+ if not android_commands.GetAttachedDevices(hardware=False):
return
time.sleep(1)
@@ -98,7 +98,7 @@ class PortPool(object):
def _GetAvailablePort():
"""Returns an available TCP port for the console."""
used_ports = []
- emulators = android_commands.GetEmulators()
+ emulators = android_commands.GetAttachedDevices(hardware=False)
for emulator in emulators:
used_ports.append(emulator.split('-')[1])
for port in PortPool.port_range():
« no previous file with comments | « build/android/pylib/android_commands.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698