diff options
Diffstat (limited to 'build/android')
| -rw-r--r-- | build/android/pylib/content_settings.py | 3 | ||||
| -rw-r--r-- | build/android/pylib/device_settings.py | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/build/android/pylib/content_settings.py b/build/android/pylib/content_settings.py index a4cd896..052af75 100644 --- a/build/android/pylib/content_settings.py +++ b/build/android/pylib/content_settings.py @@ -12,7 +12,8 @@ class ContentSettings(dict): def __init__(self, table, adb): super(ContentSettings, self).__init__() - assert adb.GetBuildId()[0] >= 'J', 'ContentSettings supported on >= J' + assert adb.system_properties['ro.build.version.sdk'] >= 16, ( + 'ContentSettings supported only on SDK 16 and later') self._table = table self._adb = adb diff --git a/build/android/pylib/device_settings.py b/build/android/pylib/device_settings.py index 1e53ffc..e7ddab7 100644 --- a/build/android/pylib/device_settings.py +++ b/build/android/pylib/device_settings.py @@ -22,9 +22,8 @@ def ConfigureContentSettingsDict(adb, desired_settings): desired_settings: A dict of {table: {key: value}} for all settings to configure. """ - if adb.GetBuildId()[0] < 'J': - logging.error('Skipping content settings configuration due to ' - 'pre-JellyBean Android version') + if adb.system_properties['ro.build.version.sdk'] < 16: + logging.error('Skipping content settings configuration due to outdated sdk') return for table, key_value in sorted(desired_settings.iteritems()): |