[Android] Fix provision devices failure getting timeout.

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 71 matching lines @@
   blacklisted_devices = blacklist.Read() if blacklist else []
   if args.output_device_blacklist:
     with open(args.output_device_blacklist, 'w') as f:
       json.dump(blacklisted_devices, f)
   if all(d in blacklisted_devices for d in devices):
     raise device_errors.NoDevicesError
   return 0
 
 
 def ProvisionDevice(device, blacklist, options):
-  if options.reboot_timeout:
-    reboot_timeout = options.reboot_timeout
-  elif device.build_version_sdk >= version_codes.LOLLIPOP:
-    reboot_timeout = _DEFAULT_TIMEOUTS.LOLLIPOP
-  else:
-    reboot_timeout = _DEFAULT_TIMEOUTS.PRE_LOLLIPOP
-
   def should_run_phase(phase_name):
     return not options.phases or phase_name in options.phases
 
-  def run_phase(phase_func, reboot=True):
+  def run_phase(phase_func, reboot_timeout, reboot=True):
     try:
       device.WaitUntilFullyBooted(timeout=reboot_timeout, retries=0)
     except device_errors.CommandTimeoutError:
       logging.error('Device did not finish booting. Will try to reboot.')
       device.Reboot(timeout=reboot_timeout)
     phase_func(device, options)
     if reboot:
       device.Reboot(False, retries=0)
       device.adb.WaitForDevice()
 
   try:
+    if options.reboot_timeout:
+      reboot_timeout = options.reboot_timeout
+    elif device.build_version_sdk >= version_codes.LOLLIPOP:
+      reboot_timeout = _DEFAULT_TIMEOUTS.LOLLIPOP
+    else:
+      reboot_timeout = _DEFAULT_TIMEOUTS.PRE_LOLLIPOP
+
     if should_run_phase(_PHASES.WIPE):
       if (options.chrome_specific_wipe or device.IsUserBuild() or
           device.build_version_sdk >= version_codes.MARSHMALLOW):
-        run_phase(WipeChromeData)
+        run_phase(WipeChromeData, reboot_timeout)
       else:
-        run_phase(WipeDevice)
+        run_phase(WipeDevice, reboot_timeout)
 
     if should_run_phase(_PHASES.PROPERTIES):
-      run_phase(SetProperties)
+      run_phase(SetProperties, reboot_timeout)
 
     if should_run_phase(_PHASES.FINISH):
-      run_phase(FinishProvisioning, reboot=False)
+      run_phase(FinishProvisioning, reboot_timeout, reboot=False)
 
     if options.chrome_specific_wipe:
       package = "com.google.android.gms"
       version_name = device.GetApplicationVersion(package)
       logging.info("Version name for %s is %s", package, version_name)
 
     CheckExternalStorage(device)
 
   except device_errors.CommandTimeoutError:
     logging.exception('Timed out waiting for device %s. Adding to blacklist.',
@@ skipping 411 matching lines @@
   devil_chromium.Initialize(adb_path=args.adb_path)
 
   try:
     return ProvisionDevices(args)
   except (device_errors.DeviceUnreachableError, device_errors.NoDevicesError):
     return exit_codes.INFRA
 
 
 if __name__ == '__main__':
   sys.exit(main())