[Telemetry] Remove adb_commands usage from android_device

tools/telemetry/telemetry/core/platform/android_device.py

Index: tools/telemetry/telemetry/core/platform/android_device.py
diff --git a/tools/telemetry/telemetry/core/platform/android_device.py b/tools/telemetry/telemetry/core/platform/android_device.py
index b5732526fbed68511de562030e4c35bc5ebf88a6..7e6bea0e0e0b3c4736062c480e90915de5d5d1ef 100644
--- a/tools/telemetry/telemetry/core/platform/android_device.py
+++ b/tools/telemetry/telemetry/core/platform/android_device.py
@@ -3,14 +3,15 @@
 # found in the LICENSE file.
 import logging
 import os
-import re
-import subprocess
-import sys
 
 from telemetry.core.platform import device
 from telemetry.core.platform.profiler import monsoon
 from telemetry.core import util
-from telemetry.internal.backends import adb_commands
+
+util.AddDirToPythonPath(util.GetChromiumSrcDir(), 'build', 'android')
+from pylib import constants # pylint: disable=import-error
+from pylib.device import device_errors # pylint: disable=import-error
+from pylib.device import device_utils # pylint: disable=import-error
 
 
 class AndroidDevice(device.Device):
@@ -42,9 +43,10 @@ class AndroidDevice(device.Device):
   def enable_performance_mode(self):
     return self._enable_performance_mode
 
-
 def GetDeviceSerials():
-  device_serials = adb_commands.GetAttachedDevices()
+  device_serials = [d.adb.GetDeviceSerial()
+                    for d in device_utils.DeviceUtils.GetAttachedDevices()]
+
   # The monsoon provides power for the device, so for devices with no
   # real battery, we need to turn them on after the monsoon enables voltage
   # output to the device.
@@ -65,8 +67,9 @@ The Monsoon's power output has been enabled. Please now ensure that:
 
 Waiting for device...
 """)
-      util.WaitFor(adb_commands.GetAttachedDevices, 600)
-      device_serials = adb_commands.GetAttachedDevices()
+      util.WaitFor(device_utils.DeviceUtils.GetAttachedDevices, 600)
+      device_serials = [d.adb.GetDeviceSerial()
+          for d in device_utils.DeviceUtils.GetAttachedDevices()]
     except IOError:
       return []
   return device_serials
@@ -84,7 +87,7 @@ def GetDevice(finder_options):
         finder_options.device,
         enable_performance_mode=not finder_options.no_performance_mode)
 
-  devices = AndroidDevice.GetAllConnectedDevices()
+  devices = AndroidDevice.GetAttachedDevices()
   if len(devices) == 0:
     logging.info('No android devices found.')
     return None
@@ -98,33 +101,15 @@ def GetDevice(finder_options):
 
 def CanDiscoverDevices():
   """Returns true if devices are discoverable via adb."""
-  if not adb_commands.IsAndroidSupported():
-    logging.info(
-        'Android build commands unavailable on this machine. '
-        'Have you installed Android build dependencies?')
+  adb_path = constants.GetAdbPath()
+  if os.path.isabs(adb_path) and not os.path.exists(adb_path):
     return False
   try:
-    with open(os.devnull, 'w') as devnull:
-      adb_process = subprocess.Popen(
-          ['adb', 'devices'], stdout=subprocess.PIPE, stderr=subprocess.PIPE,
-          stdin=devnull)
-      stdout = adb_process.communicate()[0]
-    if re.search(re.escape('????????????\tno permissions'), stdout) != None:
-      logging.warn('adb devices gave a permissions error. '
-                   'Consider running adb as root:')
-      logging.warn('  adb kill-server')
-      logging.warn('  sudo `which adb` devices\n\n')
-    return True
-  except OSError:
-    pass
-  chromium_adb_path = os.path.join(
-      util.GetChromiumSrcDir(), 'third_party', 'android_tools', 'sdk',
-      'platform-tools', 'adb')
-  if sys.platform.startswith('linux') and os.path.exists(chromium_adb_path):
-    os.environ['PATH'] = os.pathsep.join(
-        [os.path.dirname(chromium_adb_path), os.environ['PATH']])
+    device_utils.DeviceUtils.GetAttachedDevices()
     return True
-  return False
+  except (device_errors.CommandFailedError, device_errors.CommandTimeoutError,
+          OSError):
+    return False
 
 
 def FindAllAvailableDevices(_):