[Android] Clean up old_interface in build/android/.

build/android/pylib/device/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 54 matching lines @@
     'enable_command': (
         'echo 0x4A > /sys/kernel/debug/bq24192/INPUT_SRC_CONT && '
         'echo 1 > /sys/class/power_supply/usb/online'),
     'disable_command': (
         'echo 0xCA > /sys/kernel/debug/bq24192/INPUT_SRC_CONT && '
         'chmod 644 /sys/class/power_supply/usb/online && '
         'echo 0 > /sys/class/power_supply/usb/online'),
   },
 ]
 
+# This must be done in a single shell command.
+_RESTART_ADBD_SCRIPT = """
+    function restart() {
+      stop adbd
+      start adbd
+    }
+
+    restart &
+"""
+
+
 @decorators.WithExplicitTimeoutAndRetries(
     _DEFAULT_TIMEOUT, _DEFAULT_RETRIES)
 def GetAVDs():
   """Returns a list of Android Virtual Devices.
 
   Returns:
     A list containing the configured AVDs.
   """
   lines = cmd_helper.GetCmdOutput([
       os.path.join(constants.ANDROID_SDK_ROOT, 'tools', 'android'),
@@ skipping 290 matching lines @@
       return 'Wi-Fi is enabled' in self.RunShellCommand(['dumpsys', 'wifi'],
                                                         check_return=False)
 
     self.adb.WaitForDevice()
     timeout_retry.WaitFor(sd_card_ready)
     timeout_retry.WaitFor(pm_ready)
     timeout_retry.WaitFor(boot_completed)
     if wifi:
       timeout_retry.WaitFor(wifi_enabled)
 
+  @decorators.WithTimeoutAndRetriesFromInstance()
+  def RestartAdbd(self, timeout=None, retries=None):
+    with device_temp_file.DeviceTempFile(self.adb) as tmp:
+      self.WriteFile(tmp.name, _RESTART_ADBD_SCRIPT)
+      self.RunShellCommand(['sh', tmp.name], as_root=True, check_return=True)

[perezju, 2015/03/30 16:01:16]

wouldn't RunShellCommand(_RESTART_ADBD_SCRIPT, ...) "just work"?

[jbudorick, 2015/03/30 16:42:14]

Not quite (which is probably what I tried before this), but
RunShellCommand(['sh', '-c', _RESTART_ADBD_SCRIPT]) does. Switching to that
instead of the DeviceTempFile version.

+    self.adb.WaitForDevice()
+
   REBOOT_DEFAULT_TIMEOUT = 10 * _DEFAULT_TIMEOUT
   REBOOT_DEFAULT_RETRIES = _DEFAULT_RETRIES
 
   @decorators.WithTimeoutAndRetriesDefaults(
       REBOOT_DEFAULT_TIMEOUT,
       REBOOT_DEFAULT_RETRIES)
   def Reboot(self, block=True, wifi=False, timeout=None, retries=None):
     """Reboot the device.
 
     Args:
@@ skipping 110 matching lines @@
     def do_run(cmd):
       try:
         return self.adb.Shell(cmd)
       except device_errors.AdbCommandFailedError as exc:
         if check_return:
           raise
         else:
           return exc.output
 
     if not isinstance(cmd, basestring):
-      cmd = ' '.join(cmd_helper.SingleQuote(s) for s in cmd)
+      cmd = ' '.join(cmd_helper.SingleQuote(s) for s in cmd if s)

[perezju, 2015/03/30 16:01:16]

Not sure if we want to do this. A client may have a valid reason to want to pass
an empty string as an argument. Maybe "if s is not None"? (Maybe clients should
be expected to pass lists with only valid arguments?)

Edit: Ah, I see where this is used. Yeah, I would rather have the client do the
filtering itself, and pass only the arguments it needs.

[jbudorick, 2015/03/30 16:42:14]

I was trying to think of cases where a client would want to do this and
couldn't. That said, I think that expecting the client to filter out things it
doesn't want is reasonable and will switch to that.

     if env:
       env = ' '.join(env_quote(k, v) for k, v in env.iteritems())
       cmd = '%s %s' % (env, cmd)
     if cwd:
       cmd = 'cd %s && %s' % (cmd_helper.SingleQuote(cwd), cmd)
     if as_root and self.NeedsSU():
       # "su -c sh -c" allows using shell features in |cmd|
       cmd = 'su -c sh -c %s' % cmd_helper.SingleQuote(cmd)
     if timeout is None:
       timeout = self._default_timeout
@@ skipping 1115 matching lines @@
     """
     if not devices:
       devices = adb_wrapper.AdbWrapper.GetDevices()
       if not devices:
         raise device_errors.NoDevicesError()
     devices = [d if isinstance(d, cls) else cls(d) for d in devices]
     if async:
       return parallelizer.Parallelizer(devices)
     else:
       return parallelizer.SyncParallelizer(devices)