[Android] Convert battery utilities to DeviceUtils.

build/android/provision_devices.py

Index: build/android/provision_devices.py
diff --git a/build/android/provision_devices.py b/build/android/provision_devices.py
index 824e64202e78787d1096eedd73ddaa4e7b704dc1..bb60e79ddebe2c7b471c51c32ecb5b72417377dd 100755
--- a/build/android/provision_devices.py
+++ b/build/android/provision_devices.py
@@ -25,6 +25,7 @@ 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'))
@@ -84,8 +85,9 @@ def PushAndLaunchAdbReboot(device, target):
   device.PushChangedFiles([(adb_reboot, '/data/local/tmp/')])
   # Launch adb_reboot
   logging.info('  Launching adb_reboot ...')
-  device.old_interface.GetAndroidToolStatusAndOutput(
-      '/data/local/tmp/adb_reboot')
+  device.RunShellCommand([
+      device.GetDevicePieWrapper(),
+      '/data/local/tmp/adb_reboot'])
 
 
 def _ConfigureLocalProperties(device, java_debug=True):
@@ -149,6 +151,15 @@ def WipeDeviceIfPossible(device, timeout):
     pass
 
 
+def ChargeDeviceToLevel(device, level):
+  def device_charged():
+    battery_level = int(device.GetBatteryInfo().get('level', 100))

[perezju, 2015/02/23 10:43:32]

I see this was also on the previous version of the code, but why do we need a
default of 100? Do some devices not return the battery level? Should we at least
log a warning when this is the case?

[jbudorick, 2015/02/24 15:44:53]

I'm not sure when or why the default was added, but I imagine it was something
along those lines. I've added a warning in case battery_level isn't available.

+    logging.info('current battery level: %d', battery_level)
+    return battery_level >= level
+
+  timeout_retry.WaitFor(device_charged, wait_period=60)
+
+
 def ProvisionDevice(device, options):
   if options.reboot_timeout:
     reboot_timeout = options.reboot_timeout
@@ -179,24 +190,9 @@ def ProvisionDevice(device, options):
       device_settings.ConfigureContentSettings(
           device, device_settings.NETWORK_DISABLED_SETTINGS)
     if options.min_battery_level is not None:
-      try:
-        battery_info = device.old_interface.GetBatteryInfo()
-      except Exception as e:
-        battery_info = {}
-        logging.error('Unable to obtain battery info for %s, %s',
-                      str(device), e)
-
-      while int(battery_info.get('level', 100)) < options.min_battery_level:
-        if not device.old_interface.IsDeviceCharging():
-          if device.old_interface.CanControlUsbCharging():
-            device.old_interface.EnableUsbCharging()
-          else:
-            logging.error('Device is not charging')
-            break
-        logging.info('Waiting for device to charge. Current level=%s',
-                     battery_info.get('level', 0))
-        time.sleep(60)
-        battery_info = device.old_interface.GetBatteryInfo()
+      device.SetUsbCharging(True)

[perezju, 2015/02/23 10:43:32]

There seems to be a change of logic w.r.t. previous version:

- we did not try to enable usb charging if either: the device was already
charging somehow (e.g. via AC or wireless), or we did not find suitable commands
to enable usb charging.
- we now try to enable usb charging regardless of the current state, and an
exception is raised if we're an unable to find usb charging commands.

Both changes seem reasonable to me, just wanted to make sure that these are
indeed intended (and we don't expect to see devices where the required usb
commands are not available).

[jbudorick, 2015/02/24 15:44:53]

These changes were both intentional, but on reconsidering (and running locally
with an N7), it's probably better to have provision_devices catch and log the
exception if we can't enable charging. After all, if we don't have the commands,
charging probably wasn't disabled in the first place.

+      ChargeDeviceToLevel(device, options.min_battery_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',