Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1298)

Unified Diff: build/android/pylib/content_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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/pylib/constants.py ('k') | build/android/pylib/device_settings.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/pylib/content_settings.py
diff --git a/build/android/pylib/content_settings.py b/build/android/pylib/content_settings.py
index d2220537202f9dc0186adb2503426de5e1186af8..f00553f18165cfcab3ef8f6ed5bfd80726de1db7 100644
--- a/build/android/pylib/content_settings.py
+++ b/build/android/pylib/content_settings.py
@@ -2,6 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+from pylib import constants
+
class ContentSettings(dict):
@@ -15,7 +17,7 @@ class ContentSettings(dict):
sdk_version_string = device.GetProp('ro.build.version.sdk')
try:
sdk_version = int(sdk_version_string)
- assert sdk_version >= 16, (
+ assert sdk_version >= constants.ANDROID_SDK_VERSION_CODES.JELLY_BEAN, (
'ContentSettings supported only on SDK 16 and later')
except ValueError:
assert False, ('Unknown SDK version %s' % sdk_version_string)
« no previous file with comments | « build/android/pylib/constants.py ('k') | build/android/pylib/device_settings.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698