Update from https://crrev.com/305340

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'
+_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
@@ skipping 38 matching lines @@
   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.GetProp('ro.build.type') != 'userdebug'):
+  if device.GetProp('ro.build.type') != 'userdebug':
+    logging.warning('Unable to disable lockscreen on user builds.')
     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)]
+  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):
+    db = _LOCK_SCREEN_SETTINGS_PATH
+    locksettings = get_lock_settings('locksettings')
+  elif device.FileExists(_ALTERNATE_LOCK_SCREEN_SETTINGS_PATH):
+    db = _ALTERNATE_LOCK_SCREEN_SETTINGS_PATH
+    locksettings = get_lock_settings('secure') + get_lock_settings('system')
+  else:
+    logging.warning('Unable to find database file to set lock screen settings.')
+    return
+
   for table, key, value in locksettings:
     # Set the lockscreen setting for default user '0'
     columns = ['name', 'user', 'value']
     values = [key, '0', value]
 
     cmd = """begin transaction;
 delete from '%(table)s' where %(primary_key)s='%(primary_value)s';
 insert into '%(table)s' (%(columns)s) values (%(values)s);
 commit transaction;""" % {
       'table': table,
       'primary_key': columns[0],
       'primary_value': values[0],
       'columns': ', '.join(columns),
       'values': ', '.join(["'%s'" % value for value in values])
     }
-    output_msg = device.RunShellCommand('sqlite3 %s "%s"' % (db, cmd))
+    output_msg = device.RunShellCommand('sqlite3 %s "%s"' % (db, cmd),
+                                        as_root=True)
     if output_msg:
-      print ' '.join(output_msg)
+      logging.info(' '.join(output_msg))
 
 
 ENABLE_LOCATION_SETTINGS = [
   # Note that setting these in this order is required in order for all of
   # them to take and stick through a reboot.
   ('com.google.settings/partner', [
     ('use_location_for_services', 1),
   ]),
   ('settings/secure', [
     # Ensure Geolocation is enabled and allowed for tests.
@@ skipping 64 matching lines @@
     ('user_rotation', 0),
   ]),
 ]
 
 NETWORK_DISABLED_SETTINGS = [
   ('settings/global', [
     ('airplane_mode_on', 1),
     ('wifi_on', 0),
   ]),
 ]