[Android] Switch to DeviceUtils versions of Ls, SetJavaAsserts, GetProp, and SetProp.

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 content_settings
 
 _LOCK_SCREEN_SETTINGS_PATH = '/data/system/locksettings.db'
 PASSWORD_QUALITY_UNSPECIFIED = '0'
 
 
 def ConfigureContentSettingsDict(device, desired_settings):
   """Configures device content setings from a dictionary.
 
   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 dict of {table: {key: value}} for all
         settings to configure.
   """
   try:
-    sdk_version = int(device.old_interface.system_properties[
-        'ro.build.version.sdk'])
+    sdk_version = int(device.GetProp('ro.build.version.sdk'))
   except ValueError:
     logging.error('Skipping content settings configuration, unknown sdk %s',
-                  device.old_interface.system_properties[
-                      'ro.build.version.sdk'])
+                  device.GetProp('ro.build.version.sdk'))
     return
 
   if sdk_version < 16:
     logging.error('Skipping content settings configuration due to outdated sdk')
     return
 
-  device.old_interface.system_properties['persist.sys.usb.config'] = 'adb'
+  device.SetProp('persist.sys.usb.config', 'adb')
   device.old_interface.WaitForDevicePm()
 
-  if device.old_interface.GetBuildType() == 'userdebug':
+  if device.GetProp('ro.build.type') == 'userdebug':
     for table, key_value in sorted(desired_settings.iteritems()):
       settings = content_settings.ContentSettings(table, device)
       for key, value in key_value.iteritems():
         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 (not device.old_interface.FileExistsOnDevice(_LOCK_SCREEN_SETTINGS_PATH) or
-      device.old_interface.GetBuildType() != 'userdebug'):
+      device.GetProp('ro.build.type') != 'userdebug'):
     return
 
   db = _LOCK_SCREEN_SETTINGS_PATH
   locksettings = [('locksettings', 'lockscreen.disabled', '1'),
                   ('locksettings', 'lockscreen.password_type',
                    PASSWORD_QUALITY_UNSPECIFIED),
                   ('locksettings', 'lockscreen.password_type_alternate',
                    PASSWORD_QUALITY_UNSPECIFIED)]
   for table, key, value in locksettings:
     # Set the lockscreen setting for default user '0'
@@ skipping 84 matching lines @@
   },
 }
 
 
 NETWORK_DISABLED_SETTINGS = {
   'settings/global': {
     'airplane_mode_on': 1,
     'wifi_on': 0,
   },
 }