build/android/provision_devices.py - Issue 737033003: Do not restart the device if the data was not wiped.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/android/provision_devices.py

Issue 737033003: Do not restart the device if the data was not wiped. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove last commit. Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: build/android/provision_devices.py

diff --git a/build/android/provision_devices.py b/build/android/provision_devices.py

index da68c1df0f9ac5831e2507af3f85635677757695..0dc8c817dce6432fc87257b73794bb528e788c1b 100755

--- a/build/android/provision_devices.py

+++ b/build/android/provision_devices.py

@@ -190,8 +190,9 @@ def ProvisionDevice(device, options, is_perf):

battery_info.get('level', 0))

time.sleep(60)

battery_info = device.old_interface.GetBatteryInfo()

- # TODO(jbudorick): Tune the timeout per OS version.

- device.Reboot(True, timeout=600, retries=0)

+ if not options.skip_wipe:

+ # TODO(jbudorick): Tune the timeout per OS version.

+ device.Reboot(True, timeout=600, retries=0)

device.RunShellCommand('date -s %s' % time.strftime('%Y%m%d.%H%M%S',

time.gmtime()),

as_root=True)

« no previous file with comments | « no previous file | no next file » | no next file with comments »