Reboot device after configuring in provision script.

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>]
@@ skipping 102 matching lines @@
     dir_path = '/'.join(path_list[:len(path_list)-1])
     device.old_interface.RunShellCommandWithSU('mkdir -p %s' % dir_path)
     device.old_interface.RunShellCommand('echo %s > %s' %
                                          (adb_keys[0], constants.ADB_KEYS_FILE))
     for adb_key in adb_keys[1:]:
       device.old_interface.RunShellCommand(
         'echo %s >> %s' % (adb_key, constants.ADB_KEYS_FILE))
 
 
 def ProvisionDevices(options):
+  # TODO(jbudorick): Parallelize provisioning of all attached devices after
+  # swithcing from AndroidCommands.
   if options.device is not None:
     devices = [options.device]
   else:
     devices = android_commands.GetAttachedDevices()
   for device_serial in devices:
     device = device_utils.DeviceUtils(device_serial)
     device.old_interface.EnableAdbRoot()
     WipeDeviceData(device)
   try:
-    (device_utils.DeviceUtils.parallel(devices)
-     .old_interface.Reboot(True))
+    device_utils.DeviceUtils.parallel(devices).old_interface.Reboot(True)
   except errors.DeviceUnresponsiveError:
     pass
   for device_serial in devices:
     device = device_utils.DeviceUtils(device_serial)
     device.WaitUntilFullyBooted(timeout=90)
     device.old_interface.EnableAdbRoot()
     _ConfigureLocalProperties(device)
     device_settings.ConfigureContentSettingsDict(
         device, device_settings.DETERMINISTIC_DEVICE_SETTINGS)
     # TODO(tonyg): We eventually want network on. However, currently radios
     # can cause perfbots to drain faster than they charge.
     if 'perf' in os.environ.get('BUILDBOT_BUILDERNAME', '').lower():
       device_settings.ConfigureContentSettingsDict(
           device, device_settings.NETWORK_DISABLED_SETTINGS)
     device.old_interface.RunShellCommandWithSU('date -u %f' % time.time())
+  try:
+    device_utils.DeviceUtils.parallel(devices).old_interface.Reboot(True)
+  except errors.DeviceUnresponsiveError:
+    pass
+  for device_serial in devices:
+    device = device_utils.DeviceUtils(device_serial)
+    device.WaitUntilFullyBooted(timeout=90)
     (_, props) = device.old_interface.GetShellCommandStatusAndOutput('getprop')
     for prop in props:
       print prop
   if options.auto_reconnect:
     PushAndLaunchAdbReboot(devices, options.target)
 
 
 def main(argv):
   logging.basicConfig(level=logging.INFO)
 
@@ skipping 22 matching lines @@
       (device_utils.DeviceUtils.parallel(devices)
           .old_interface.Reboot(True).pFinish(None))
     except errors.DeviceUnresponsiveError:
       pass
   else:
     ProvisionDevices(options)
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))