[Android] Fix provisioning for perf bots on L and/or user builds.

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 b5981d9a39ffab3eb1b8ac3bba2fc0483e1882c1..54c90c3a6eef8e652f02f5ed34041e5201ce6553 100755
--- a/build/android/provision_devices.py
+++ b/build/android/provision_devices.py
@@ -140,7 +140,8 @@ def WipeDeviceIfPossible(device):
   try:
     device.EnableRoot()

[jbudorick, 2014/08/21 17:15:15]

@tonyg: it'll skip the wipe here. if we can't enable root, this will raise an
exception which will then be caught on line 145

     WipeDeviceData(device)
-    device.Reboot(True, timeout=180, retries=0)
+    # TODO(jbudorick): Tune the timeout per OS version.
+    device.Reboot(True, timeout=600, retries=0)
   except (errors.DeviceUnresponsiveError, device_errors.CommandFailedError):
     pass
 
@@ -149,7 +150,10 @@ def ProvisionDevice(device, options, is_perf):
   try:
     if not options.skip_wipe:
       WipeDeviceIfPossible(device)
-    device.EnableRoot()
+    try:
+      device.EnableRoot()

[tonyg, 2014/08/21 17:12:58]

I think the old code would skip the wipe if we couldn't enable root. Because the
wipe'll break adb on user builds. Does the new code do that too? If so, lgtm

+    except device_errors.CommandFailedError as e:
+      logging.warning(str(e))
     _ConfigureLocalProperties(device, is_perf)
     device_settings.ConfigureContentSettings(
         device, device_settings.DETERMINISTIC_DEVICE_SETTINGS)
@@ -187,7 +191,8 @@ def ProvisionDevice(device, options, is_perf):
         time.sleep(60)
         battery_info = device.old_interface.GetBatteryInfo()
     device.RunShellCommand('date -u %f' % time.time(), as_root=True)
-    device.Reboot(True, timeout=180, retries=0)
+    # TODO(jbudorick): Tune the timeout per OS version.
+    device.Reboot(True, timeout=600, retries=0)
     props = device.RunShellCommand('getprop')
     for prop in props:
       logging.info('  %s' % prop)