Revert of [Android] Remove more uses of android_commands from build/android/pylib.

build/android/pylib/utils/emulator.py

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Provides an interface to start and stop Android emulator.
 
   Emulator: The class provides the methods to launch/shutdown the emulator with
             the android virtual device named 'avd_armeabi' .
 """
 
 import logging
 import os
 import signal
 import subprocess
 import time
 
 # TODO(craigdh): Move these pylib dependencies to pylib/utils/.
+from pylib import android_commands
 from pylib import cmd_helper
 from pylib import constants
 from pylib import pexpect
 from pylib.device import device_errors
 from pylib.device import device_utils
 from pylib.utils import time_profile
 
 import errors
 import run_command
 
@@ skipping 54 matching lines @@
   """Emulator failed to launch."""
   pass
 
 def _KillAllEmulators():
   """Kill all running emulators that look like ones we started.
 
   There are odd 'sticky' cases where there can be no emulator process
   running but a device slot is taken.  A little bot trouble and and
   we're out of room forever.
   """
-  emulators = [d for d in device_utils.HealthyDevices() if d.adb.is_emulator]
+  emulators = android_commands.GetAttachedDevices(hardware=False)
   if not emulators:
     return
-  for e in emulators:
-    e.adb.Emu(['kill'])
+  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 _ in range(5):
-    if not any(d.adb.is_emulator for d in device_utils.HealthyDevices()):
+    if not android_commands.GetAttachedDevices(hardware=False):
       return
     time.sleep(1)
 
 
 def DeleteAllTempAVDs():
   """Delete all temporary AVDs which are created for tests.
 
   If the test exits abnormally and some temporary AVDs created when testing may
   be left in the system. Clean these AVDs.
   """
@@ skipping 23 matching lines @@
     Cycling through a port start position helps make us resilient."""
     ports = range(cls._port_min, cls._port_max, 2)
     n = cls._port_current_index
     cls._port_current_index = (n + 1) % len(ports)
     return ports[n:] + ports[:n]
 
 
 def _GetAvailablePort():
   """Returns an available TCP port for the console."""
   used_ports = []
-  emulators = [d for d in device_utils.HealthyDevices() if d.adb.is_emulator]
+  emulators = android_commands.GetAttachedDevices(hardware=False)
   for emulator in emulators:
-    used_ports.append(emulator.adb.GetDeviceSerial().split('-')[1])
+    used_ports.append(emulator.split('-')[1])
   for port in PortPool.port_range():
     if str(port) not in used_ports:
       return port
 
 
 def LaunchTempEmulators(emulator_count, abi, api_level, wait_for_boot=True):
   """Create and launch temporary emulators and wait for them to boot.
 
   Args:
     emulator_count: number of emulators to launch.
@@ skipping 276 matching lines @@
     logging.critical('emulator _ShutdownOnSignal')
     for sig in self._SIGNALS:
       signal.signal(sig, signal.SIG_DFL)
     self.Shutdown()
     raise KeyboardInterrupt  # print a stack
 
   def _InstallKillHandler(self):
     """Install a handler to kill the emulator when we exit unexpectedly."""
     for sig in self._SIGNALS:
       signal.signal(sig, self._ShutdownOnSignal)