build/android/pylib/content_settings.py - Issue 371813005: [Android] Switch to DeviceUtils versions of Ls, SetJavaAsserts, GetProp, and SetProp.

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

Issue 371813005: [Android] Switch to DeviceUtils versions of Ls, SetJavaAsserts, GetProp, and SetProp. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 5 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:

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

Download patch

Index: build/android/pylib/content_settings.py

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

index 172eedb9e87dc30faa9470ad885f54b2533de2c9..6993eb375324d1e78ada1887862209cb9eafc85d 100644

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

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

@@ -12,8 +12,7 @@ class ContentSettings(dict):

def __init__(self, table, device):

super(ContentSettings, self).__init__()

- sdk_version_string = device.old_interface.system_properties[

- 'ro.build.version.sdk']

+ sdk_version_string = device.GetProp('ro.build.version.sdk')

try:

sdk_version = int(sdk_version_string)

assert sdk_version >= 16, (

« no previous file with comments | « build/android/pylib/android_commands.py ('k') | build/android/pylib/device/device_utils.py » ('j') | no next file with comments »