Allow atrace over adb tcp/ip

devil/devil/android/device_utils.py

 # Copyright 2014 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 a variety of device interactions based on adb.
 
 Eventually, this will be based on adb_wrapper.
 """
 # pylint: disable=unused-argument
 
@@ skipping 240 matching lines @@
   # makes sure that the last line is also terminated, and is more memory
   # efficient than first appending an end-line to each line and then joining
   # all of them together.
   return ''.join(s for line in lines for s in (line, '\n'))
 
 
 def _IsGceInstance(serial):
   return _IPV4_ADDRESS_RE.match(serial)
 
 
-def _CreateAdbWrapper(device):
-  if _IsGceInstance(str(device)):
+def _CreateAdbWrapper(device, disable_gce=False):
+  if not disable_gce and _IsGceInstance(str(device)):
     return gce_adb_wrapper.GceAdbWrapper(str(device))
   else:
     if isinstance(device, adb_wrapper.AdbWrapper):
       return device
     else:
       return adb_wrapper.AdbWrapper(device)
 
 
 def _FormatPartialOutputError(output):
   lines = output.splitlines() if isinstance(output, basestring) else output
@@ skipping 15 matching lines @@
       r'\s*mCurrentFocus.*(Launcher|launcher).*')
   _VALID_SHELL_VARIABLE = re.compile('^[a-zA-Z_][a-zA-Z0-9_]*$')
 
   LOCAL_PROPERTIES_PATH = posixpath.join('/', 'data', 'local.prop')
 
   # Property in /data/local.prop that controls Java assertions.
   JAVA_ASSERT_PROPERTY = 'dalvik.vm.enableassertions'
 
   def __init__(self, device, enable_device_files_cache=False,
                default_timeout=_DEFAULT_TIMEOUT,
-               default_retries=_DEFAULT_RETRIES):
+               default_retries=_DEFAULT_RETRIES, disable_gce=False):

[jbudorick, 2017/03/28 20:36:03]

I don't think this is the right way to handle this; I think we'd instead want
the locations that are using the GCE functionality to pass a GceAdbWrapper
directly.

[sahilja, 2017/04/04 19:24:16]

Done.

     """DeviceUtils constructor.
 
     Args:
       device: Either a device serial, an existing AdbWrapper instance, or an
         an existing AndroidCommands instance.
       enable_device_files_cache: For PushChangedFiles(), cache checksums of
         pushed files rather than recomputing them on a subsequent call.
       default_timeout: An integer containing the default number of seconds to
         wait for an operation to complete if no explicit value is provided.
       default_retries: An integer containing the default number or times an
         operation should be retried on failure if no explicit value is provided.
     """
     self.adb = None
     if isinstance(device, basestring):
-      self.adb = _CreateAdbWrapper(device)
+      self.adb = _CreateAdbWrapper(device, disable_gce)
     elif isinstance(device, adb_wrapper.AdbWrapper):
       self.adb = device
     else:
       raise ValueError('Unsupported device value: %r' % device)
     self._commands_installed = None
     self._default_timeout = default_timeout
     self._default_retries = default_retries
     self._enable_device_files_cache = enable_device_files_cache
     self._cache = {}
     self._client_caches = {}
@@ skipping 2316 matching lines @@
       on: bool to decide state to switch to. True = on False = off.
     """
     def screen_test():
       return self.IsScreenOn() == on
 
     if screen_test():
       logger.info('Screen already in expected state.')
       return
     self.SendKeyEvent(keyevent.KEYCODE_POWER)
     timeout_retry.WaitFor(screen_test, wait_period=1)