build/android/pylib/device_settings.py - Issue 670183003: Update from chromium 62675d9fb31fb8cedc40f68e78e8445a74f362e7

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/device_settings.py

Issue 670183003: Update from chromium 62675d9fb31fb8cedc40f68e78e8445a74f362e7 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 years, 2 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/device_settings.py

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

index bc39b5d3aa307e6a80a23b8da8ce8de79385b81f..4050694ecdeaea653f1bdcd01f57c650fce7b16c 100644

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

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

@@ -4,6 +4,7 @@

import logging

+from pylib import constants

from pylib import content_settings

_LOCK_SCREEN_SETTINGS_PATH = '/data/system/locksettings.db'

@@ -32,7 +33,7 @@ def ConfigureContentSettings(device, desired_settings):

device.GetProp('ro.build.version.sdk'))

return

- if sdk_version < 16:

+ if sdk_version < constants.ANDROID_SDK_VERSION_CODES.JELLY_BEAN:

logging.error('Skipping content settings configuration due to outdated sdk')

return