Update from chromium 62675d9fb31fb8cedc40f68e78e8445a74f362e7

build/android/pylib/device_settings.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import logging
 
+from pylib import constants
 from pylib import content_settings
 
 _LOCK_SCREEN_SETTINGS_PATH = '/data/system/locksettings.db'
 PASSWORD_QUALITY_UNSPECIFIED = '0'
 
 
 def ConfigureContentSettings(device, desired_settings):
   """Configures device content setings from a list.
 
   Many settings are documented at:
     http://developer.android.com/reference/android/provider/Settings.Global.html
     http://developer.android.com/reference/android/provider/Settings.Secure.html
     http://developer.android.com/reference/android/provider/Settings.System.html
 
   Many others are undocumented.
 
   Args:
     device: A DeviceUtils instance for the device to configure.
     desired_settings: A list of (table, [(key: value), ...]) for all
         settings to configure.
   """
   try:
     sdk_version = int(device.GetProp('ro.build.version.sdk'))
   except ValueError:
     logging.error('Skipping content settings configuration, unknown sdk %s',
                   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
 
   if device.GetProp('ro.build.type') == 'userdebug':
     for table, key_value in desired_settings:
       settings = content_settings.ContentSettings(table, device)
       for key, value in key_value:
         settings[key] = value
       logging.info('\n%s %s', table, (80 - len(table)) * '-')
       for key, value in sorted(settings.iteritems()):
@@ skipping 124 matching lines @@
     ('user_rotation', 0),
   ]),
 ]
 
 NETWORK_DISABLED_SETTINGS = [
   ('settings/global', [
     ('airplane_mode_on', 1),
     ('wifi_on', 0),
   ]),
 ]