Add timeout for usb charging commands.

build/android/pylib/android_commands.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 communicate with the device via the adb command.
 
 Assumes adb binary is currently on system path.
 """
 # pylint: disable-all
 
@@ skipping 1895 matching lines @@
         device_repr = self._device[-4:]
       else:
         device_repr = '????'
       for line in out:
         logging.info('[%s]> %s', device_repr, line)
 
   def _GetControlUsbChargingCommand(self):
     if self._control_usb_charging_command['cached']:
       return self._control_usb_charging_command['command']
     self._control_usb_charging_command['cached'] = True
+    if not self.IsRootEnabled():
+      return None
     for command in CONTROL_USB_CHARGING_COMMANDS:
       # Assert command is valid.
       assert 'disable_command' in command
       assert 'enable_command' in command
       assert 'witness_file' in command
       witness_file = command['witness_file']
       if self.FileExistsOnDevice(witness_file):
         self._control_usb_charging_command['command'] = command
         return command
     return None
 
   def CanControlUsbCharging(self):
     return self._GetControlUsbChargingCommand() is not None
 
-  def DisableUsbCharging(self):
+  def DisableUsbCharging(self, timeout=10):
     command = self._GetControlUsbChargingCommand()
     if not command:
       raise Exception('Unable to act on usb charging.')
     disable_command = command['disable_command']
+    t0 = time.time()
     # Do not loop directly on self.IsDeviceCharging to cut the number of calls
     # to the device.
     while True:
+      if t0 + timeout - time.time() < 0:
+        raise pexpect.TIMEOUT('Unable to enable USB charging in time.')
       self.RunShellCommand(disable_command)
       if not self.IsDeviceCharging():
         break
 
-  def EnableUsbCharging(self):
+  def EnableUsbCharging(self, timeout=10):
     command = self._GetControlUsbChargingCommand()
     if not command:
       raise Exception('Unable to act on usb charging.')
     disable_command = command['enable_command']
+    t0 = time.time()
     # Do not loop directly on self.IsDeviceCharging to cut the number of calls
     # to the device.
     while True:
+      if t0 + timeout - time.time() < 0:
+        raise pexpect.TIMEOUT('Unable to enable USB charging in time.')
       self.RunShellCommand(disable_command)
       if self.IsDeviceCharging():
         break
 
   def IsDeviceCharging(self):
     for line in self.RunShellCommand('dumpsys battery'):
       if 'powered: ' in line:
         if line.split('powered: ')[1] == 'true':
           return True
 
 
 class NewLineNormalizer(object):
   """A file-like object to normalize EOLs to '\n'.
 
   Pexpect runs adb within a pseudo-tty device (see
   http://www.noah.org/wiki/pexpect), so any '\n' printed by adb is written
   as '\r\n' to the logfile. Since adb already uses '\r\n' to terminate
   lines, the log ends up having '\r\r\n' at the end of each line. This
   filter replaces the above with a single '\n' in the data stream.
   """
   def __init__(self, output):
     self._output = output
 
   def write(self, data):
     data = data.replace('\r\r\n', '\n')
     self._output.write(data)
 
   def flush(self):
     self._output.flush()