Add new method to disable android device charging.

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 51 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'),
   },
 ]
 
+_DEFAULT_CHARGING_COMMANDS = {
+    'witness_file': None,
+    'enable_command': 'dumpsys battery reset',
+    'disable_command': 'dumpsys battery set usb 0',
+}
 
 @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([
@@ skipping 1325 matching lines @@
       timeout: timeout in seconds
       retries: number of retries
     Returns:
       A dict containing various battery information as reported by dumpsys
       battery.
     """
     result = {}
     # Skip the first line, which is just a header.
     for line in self.RunShellCommand(
         ['dumpsys', 'battery'], check_return=True)[1:]:
-      k, v = line.split(': ', 1)
-      result[k.strip()] = v.strip()
+      # If usb charging has been disabled, an extra line of header exists.
+      # If usb charging has been disabled, an extra line of header exists.

[klundberg, 2015/03/11 14:27:14]

I'm seeing double :-)

Please remove one of the comments.

[rnephew (Wrong account), 2015/03/11 18:27:01]

Done.

+      if 'UPDATES STOPPED' in line:
+        logging.warning('Dumpsys battery not recieving updates. '

[klundberg, 2015/03/11 14:27:14]

s/recieving/receiving

[rnephew (Wrong account), 2015/03/11 18:27:01]

Done.

+                        'Run dumpsys battery reset if this is in error.')
+      elif ':' not in line:
+        logging.warning('Unknown line found in dumpsys battery.')
+        logging.warning(line)
+      else:
+        k, v = line.split(': ', 1)
+        result[k.strip()] = v.strip()
     return result
 
   @decorators.WithTimeoutAndRetriesFromInstance()
   def GetCharging(self, timeout=None, retries=None):
     """Gets the charging state of the device.
 
     Args:
       timeout: timeout in seconds
       retries: number of retries
     Returns:
@@ skipping 15 matching lines @@
         disabled.
       timeout: timeout in seconds
       retries: number of retries
     """
     if 'charging_config' not in self._cache:
       for c in _CONTROL_CHARGING_COMMANDS:
         if self.FileExists(c['witness_file']):
           self._cache['charging_config'] = c
           break
       else:
-        raise device_errors.CommandFailedError(
-            'Unable to find charging commands.')
+        logging.warning('No charging information found.'
+                        'Defaulting to generic values.')
+        self._cache['charging_config'] = _DEFAULT_CHARGING_COMMANDS
 
     if enabled:
       command = self._cache['charging_config']['enable_command']
     else:
       command = self._cache['charging_config']['disable_command']
 
     def set_and_verify_charging():
       self.RunShellCommand(command, check_return=True)
       return self.GetCharging() == enabled
 
@@ skipping 53 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)