Update from https://crrev.com/308331

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
+from pylib.device import device_errors
 
 _LOCK_SCREEN_SETTINGS_PATH = '/data/system/locksettings.db'
 _ALTERNATE_LOCK_SCREEN_SETTINGS_PATH = (
     '/data/data/com.android.providers.settings/databases/settings.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'))
+    sdk_version = device.build_version_sdk
+  except device_errors.CommandFailedError as exc:
+    logging.error('Skipping content settings configuration: %s', str(exc))
     return
 
   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':
+  if device.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()):
         logging.info('\t%s: %s', key, value)
 
 
 def SetLockScreenSettings(device):
   """Sets lock screen settings on the device.
 
   On certain device/Android configurations we need to disable the lock screen in
   a different database. Additionally, the password type must be set to
   DevicePolicyManager.PASSWORD_QUALITY_UNSPECIFIED.
   Lock screen settings are stored in sqlite on the device in:
       /data/system/locksettings.db
 
   IMPORTANT: The first column is used as a primary key so that all rows with the
   same value for that column are removed from the table prior to inserting the
   new values.
 
   Args:
     device: A DeviceUtils instance for the device to configure.
 
   Raises:
     Exception if the setting was not properly set.
   """
-  if device.GetProp('ro.build.type') != 'userdebug':
+  if device.build_type != 'userdebug':
     logging.warning('Unable to disable lockscreen on user builds.')
     return
 
   def get_lock_settings(table):
     return [(table, 'lockscreen.disabled', '1'),
             (table, 'lockscreen.password_type', PASSWORD_QUALITY_UNSPECIFIED),
             (table, 'lockscreen.password_type_alternate',
              PASSWORD_QUALITY_UNSPECIFIED)]
 
   if device.FileExists(_LOCK_SCREEN_SETTINGS_PATH):
@@ skipping 105 matching lines @@
     ('user_rotation', 0),
   ]),
 ]
 
 NETWORK_DISABLED_SETTINGS = [
   ('settings/global', [
     ('airplane_mode_on', 1),
     ('wifi_on', 0),
   ]),
 ]