summaryrefslogtreecommitdiffstats
path: root/packages/SettingsProvider
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2011-10-21 13:29:58 -0400
committerMike Lockwood <lockwood@google.com>2012-02-10 10:51:24 -0800
commit86aeb06635ef8c7f3fb1b4a935d5e8da819e2a88 (patch)
tree283b519b5b7038b142340b1e727cdab37442a2b1 /packages/SettingsProvider
parentc33d5766610c77296a80dfdc4e302cc2ff794898 (diff)
downloadframeworks_base-86aeb06635ef8c7f3fb1b4a935d5e8da819e2a88.zip
frameworks_base-86aeb06635ef8c7f3fb1b4a935d5e8da819e2a88.tar.gz
frameworks_base-86aeb06635ef8c7f3fb1b4a935d5e8da819e2a88.tar.bz2
Load lockscreen.disabled setting on database create as well as upgrade
Signed-off-by: Mike Lockwood <lockwood@android.com>
Diffstat (limited to 'packages/SettingsProvider')
-rw-r--r--packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index 381f821..8b1da1f 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -1593,6 +1593,9 @@ 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);
} finally {
if (stmt != null) stmt.close();
}