[Android] Do not set charge level when charging devices

build/android/devil/android/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 263 matching lines @@
           and entry[_PWS_AGGREGATION_INDEX] == 'l'):
         # This entry should only appear once.
         assert system_total is None
         system_total = float(entry[_PWS_POWER_CONSUMPTION_INDEX])
 
     per_package = {p: {'uid': uid, 'data': pwi_entries[uid]}
                    for p, uid in self._cache['uids'].iteritems()}
     return {'system_total': system_total, 'per_package': per_package}
 
   @decorators.WithTimeoutAndRetriesFromInstance()
-  def _ForceResetBatteryInfo(self, timeout=None, retries=None):
-    # Sometimes battery information stops updating. This kick starts it.
-    self._device.RunShellCommand(['dumpsys', 'battery', 'set', 'level', '50'],
-                                 check_return=True)
-    self._device.RunShellCommand(['dumpsys', 'battery', 'reset'],
-                                 check_return=True)
-
-  @decorators.WithTimeoutAndRetriesFromInstance()
   def GetBatteryInfo(self, timeout=None, retries=None):
     """Gets battery info for the device.
 
     Args:
       timeout: timeout in seconds
       retries: number of retries
     Returns:
       A dict containing various battery information as reported by dumpsys
       battery.
     """
@@ skipping 143 matching lines @@
   def ChargeDeviceToLevel(self, level, wait_period=60):
     """Enables charging and waits for device to be charged to given level.
 
     Args:
       level: level of charge to wait for.
       wait_period: time in seconds to wait between checking.
     """
     self.SetCharging(True)
 
     def device_charged():
-      self._ForceResetBatteryInfo()
       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)
@@ skipping 164 matching lines @@
     self._cache['profile'] = {
         'name': None,
         'witness_file': None,
         'enable_command': None,
         'disable_command': None,
         'charge_counter': None,
         'voltage': None,
         'current': None,
     }
     return False