build/android/pylib/android_commands.py - Issue 23503015: Only check if setup wizard is disabled if doing provision check.

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/pylib/android_commands.py

Issue 23503015: Only check if setup wizard is disabled if doing provision check. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Take out assert from android_commands.py. Created 7 years, 4 months ago

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

Jump to:

Index: build/android/pylib/android_commands.py

diff --git a/build/android/pylib/android_commands.py b/build/android/pylib/android_commands.py

index f8c074758d08c35ce7b637959447b1a68faaf598..be0a057d9d925d1ea70dd38f54968eb0f265123c 100644

--- a/build/android/pylib/android_commands.py

+++ b/build/android/pylib/android_commands.py

@@ -1083,7 +1083,8 @@ class AndroidCommands(object):

def GetSetupWizardStatus(self):

"""Returns the status of the device setup wizard (e.g. DISABLED)."""

status = self.RunShellCommand('getprop ro.setupwizard.mode')[0]

- assert status

+ # On some devices, the status is empty if not otherwise set. In such cases

+ # the caller should expect an empty string to be returned.

return status

def StartMonitoringLogcat(self, clear=True, logfile=None, filters=None):