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 220 matching lines @@
       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
 
     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'],

[rnephew (Wrong account), 2015/04/07 23:51:40]

This is in there because on K devices reset takes too long to run (30 seconds),
and telling it it is charging before it resets is a way around that. Instead of
deleting that line, I would recommend adding a line for setting ac to 1, or this
will break for K devices. 

[fmeawad, 2015/04/07 23:56:13]

I cannot set the ac to 1 as well as this will set the devices to have 2 power
sources (which is not the case after you do a reset, as it only picks one).
Will test it on a K and try to find a better solution as well as add comments as
pointed by john.

[fmeawad, 2015/04/08 00:54:29]

I checked the code, and this code is never called from a K device (it is guarded
by a check "dumpsys batterystats -c" and makes sure it is either revision 8 or 9
every where.
I have also tried manually on a K device and it seemed to take at most 5
seconds.
Given that we are deprecating most K devices, I think we can afford a  few
seconds on that platform for a clean solution. WDYT?

-                                 check_return=True)
     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.
@@ skipping 36 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)