[Android] Convert to BatteryUtils

build/android/provision_devices.py

 #!/usr/bin/env python
 #
 # Copyright (c) 2013 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.
 
 """Provisions Android devices with settings required for bots.
 
 Usage:
   ./provision_devices.py [-d <device serial number>]
 """
 
 import argparse
 import logging
 import os
 import posixpath
 import re
 import subprocess
 import sys
 import time
 
 from pylib import android_commands
 from pylib import constants
 from pylib import device_settings
+from pylib.device import battery_utils
 from pylib.device import device_blacklist
 from pylib.device import device_errors
 from pylib.device import device_utils
 from pylib.utils import run_tests_helper
 from pylib.utils import timeout_retry
 
 sys.path.append(os.path.join(constants.DIR_SOURCE_ROOT,
                              'third_party', 'android_testrunner'))
 import errors
 
@@ skipping 121 matching lines @@
 
 def WipeDeviceIfPossible(device, timeout, options):
   try:
     device.EnableRoot()
     WipeDeviceData(device, options)
     device.Reboot(True, timeout=timeout, retries=0)
   except (errors.DeviceUnresponsiveError, device_errors.CommandFailedError):
     pass
 
 
 def ChargeDeviceToLevel(device, level):

[nednguyen, 2015/04/01 21:22:16]

Shouldn't this be a method of BatteryUtils class?

[rnephew (Wrong account), 2015/04/01 21:58:11]

Good idea, moved.

   def device_charged():
-    battery_level = device.GetBatteryInfo().get('level')
+    battery_level = battery.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: %d', battery_level)
       battery_level = int(battery_level)
     return battery_level >= level
 
+  battery = battery_utils.BatteryUtils(device)
+  battery.SetCharging(True)
   timeout_retry.WaitFor(device_charged, wait_period=60)
 
 
 def ProvisionDevice(device, options):
   if options.reboot_timeout:
     reboot_timeout = options.reboot_timeout
   elif (device.build_version_sdk >=
         constants.ANDROID_SDK_VERSION_CODES.LOLLIPOP):
     reboot_timeout = _DEFAULT_TIMEOUTS.LOLLIPOP
   else:
@@ skipping 14 matching lines @@
           device, device_settings.DISABLE_LOCATION_SETTINGS)
     else:
       device_settings.ConfigureContentSettings(
           device, device_settings.ENABLE_LOCATION_SETTINGS)
     device_settings.SetLockScreenSettings(device)
     if options.disable_network:
       device_settings.ConfigureContentSettings(
           device, device_settings.NETWORK_DISABLED_SETTINGS)
     if options.min_battery_level is not None:
       try:
-        device.SetCharging(True)

[nednguyen, 2015/04/01 21:22:15]

This removal looks like a functional change.

[rnephew (Wrong account), 2015/04/01 21:58:11]

It was moved into ChargeDeviceToLevel instead of being here. The action still
takes place.

         ChargeDeviceToLevel(device, options.min_battery_level)
       except device_errors.CommandFailedError as e:
         logging.exception('Unable to charge device to specified level.')
 
     if not options.skip_wipe:
       device.Reboot(True, timeout=reboot_timeout, retries=0)
     device.RunShellCommand('date -s %s' % time.strftime('%Y%m%d.%H%M%S',
                                                         time.gmtime()),
                            as_root=True)
     props = device.RunShellCommand('getprop')
@@ skipping 73 matching lines @@
   parser.add_argument('--adb-key-files', type=str, nargs='+',
                       help='list of adb keys to push to device')
   args = parser.parse_args()
   constants.SetBuildType(args.target)
 
   return ProvisionDevices(args)
 
 
 if __name__ == '__main__':
   sys.exit(main())