Disable ac charging similar to usb charging (used by Nexus6)

build/android/pylib/device/battery_utils.py

 # Copyright 2015 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 with power.
 """
 # pylint: disable=unused-argument
 
 import collections
 import contextlib
@@ skipping 219 matching lines @@
       timeout: timeout in seconds
       retries: number of retries
 
     Raises:
       device_errors.CommandFailedError: When resetting batterystats fails to
         reset power values.
     """
     def battery_updates_disabled():
       return self.GetCharging() is False
 
+    if (self._device.build_version_sdk <

[jbudorick, 2015/04/08 17:43:11]

Please add this exception to the Raises: section of the docstring.

[fmeawad, 2015/04/08 18:00:23]

Done.

+        constants.ANDROID_SDK_VERSION_CODES.LOLLIPOP):
+      raise device_errors.DeviceVersionError('Device must be L or higher.')
+
     self._device.RunShellCommand(
-        ['dumpsys', 'battery', 'set', 'usb', '1'], check_return=True)
+        ['dumpsys', 'battery', 'reset'], check_return=True)
     self._device.RunShellCommand(
         ['dumpsys', 'batterystats', '--reset'], check_return=True)
     battery_data = self._device.RunShellCommand(
         ['dumpsys', 'batterystats', '--charged', '--checkin'],
         check_return=True)
     ROW_TYPE_INDEX = 3
     PWI_POWER_INDEX = 5
     for line in battery_data:
       l = line.split(',')
       if (len(l) > PWI_POWER_INDEX and l[ROW_TYPE_INDEX] == 'pwi'
           and l[PWI_POWER_INDEX] != 0):
         raise device_errors.CommandFailedError(
             'Non-zero pmi value found after reset.')
+    self._device.RunShellCommand(['dumpsys', 'battery', 'set', 'ac', '0'],
+                                 check_return=True)
     self._device.RunShellCommand(['dumpsys', 'battery', 'set', 'usb', '0'],
                                  check_return=True)
     timeout_retry.WaitFor(battery_updates_disabled, wait_period=1)
 
   # TODO(rnephew): Make private when all use cases can use the context manager.
   def EnableBatteryUpdates(self, timeout=None, retries=None):
     """ Restarts device charging so that dumpsys no longer collects power data.
 
     Args:
       timeout: timeout in seconds
       retries: number of retries
     """
     def battery_updates_enabled():
       return self.GetCharging() is True
 
-    self._device.RunShellCommand(['dumpsys', 'battery', 'set', 'usb', '1'],
-                                 check_return=True)
+    if (self._device.build_version_sdk <

[jbudorick, 2015/04/08 17:43:11]

same here

[fmeawad, 2015/04/08 18:00:23]

Done.

+        constants.ANDROID_SDK_VERSION_CODES.LOLLIPOP):
+      raise device_errors.DeviceVersionError('Device must be L or higher.')
+
     self._device.RunShellCommand(['dumpsys', 'battery', 'reset'],
                                  check_return=True)
     timeout_retry.WaitFor(battery_updates_enabled, wait_period=1)
 
   @contextlib.contextmanager
   def BatteryMeasurement(self, timeout=None, retries=None):
     """Context manager that enables battery data collection. It makes
     the device appear to stop charging so that dumpsys will start collecting
     power data since last charge. Once the with block is exited, charging is
     resumed and power data since last charge is no longer collected.
 
     Only for devices L and higher.
 
     Example usage:
       with BatteryMeasurement():
         browser_actions()
         get_power_data() # report usage within this block
       after_measurements() # Anything that runs after power
                            # measurements are collected
 
     Args:
       timeout: timeout in seconds
       retries: number of retries
 
     Raises:
       device_errors.CommandFailedError: If device is not L or higher.

[fmeawad, 2015/04/08 18:00:23]

Also fixed this one to be DeviceVersionError

     """
     if (self._device.build_version_sdk <
         constants.ANDROID_SDK_VERSION_CODES.LOLLIPOP):
       raise device_errors.DeviceVersionError('Device must be L or higher.')
     try:
       self.DisableBatteryUpdates(timeout=timeout, retries=retries)
       yield
     finally:
       self.EnableBatteryUpdates(timeout=timeout, retries=retries)
 
@@ skipping 10 matching lines @@
       battery_level = self.GetBatteryInfo().get('level')
       if battery_level is None:
         logging.warning('Unable to find current battery level.')
         battery_level = 100
       else:
         logging.info('current battery level: %s', battery_level)
         battery_level = int(battery_level)
       return battery_level >= level
 
     timeout_retry.WaitFor(device_charged, wait_period=wait_period)