| Index: build/android/provision_devices.py
|
| diff --git a/build/android/provision_devices.py b/build/android/provision_devices.py
|
| index 5a8019f31a973862e7e17fb42db642a7d97ba521..e3b7631f63f9df26f291d84945e32cd7215f356a 100755
|
| --- a/build/android/provision_devices.py
|
| +++ b/build/android/provision_devices.py
|
| @@ -89,13 +89,6 @@ def ProvisionDevices(args):
|
|
|
|
|
| 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
|
|
|
| @@ -111,6 +104,13 @@ def ProvisionDevice(device, blacklist, options):
|
| 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):
|
|
|