diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-06-12 11:53:26 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2012-06-12 11:53:26 -0700 |
| commit | d1645f8d0f30709340eb6b6d6da5022bbab77024 (patch) | |
| tree | 14a3d4c2822f3f81efa4a7e10ba82fbeb1c89684 /packages/SettingsProvider | |
| parent | 0ed6f9a01f8bc6f6e7575aa068fe7a8556e79613 (diff) | |
| download | frameworks_base-d1645f8d0f30709340eb6b6d6da5022bbab77024.zip frameworks_base-d1645f8d0f30709340eb6b6d6da5022bbab77024.tar.gz frameworks_base-d1645f8d0f30709340eb6b6d6da5022bbab77024.tar.bz2 | |
Disable lockscreen using a system property.
For factory testing.
Change-Id: Ie5b8be432ab8ad40d8752f978899987c95a5aef9
Diffstat (limited to 'packages/SettingsProvider')
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index b0939de..9ad02b9 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -1633,8 +1633,12 @@ public class DatabaseHelper extends SQLiteOpenHelper { loadStringSetting(stmt, Settings.Secure.ACCESSIBILITY_SCREEN_READER_URL, R.string.def_accessibility_screen_reader_url); - loadBooleanSetting(stmt, Settings.System.LOCKSCREEN_DISABLED, - R.bool.def_lockscreen_disabled); + if (SystemProperties.getBoolean("ro.lockscreen.disable.default", false) == true) { + loadSetting(stmt, Settings.System.LOCKSCREEN_DISABLED, "1"); + } else { + loadBooleanSetting(stmt, Settings.System.LOCKSCREEN_DISABLED, + R.bool.def_lockscreen_disabled); + } loadBooleanSetting(stmt, Settings.Secure.DEVICE_PROVISIONED, R.bool.def_device_provisioned); |