Add Aware Lock Settings
Bug: 132106801
Test: rebuild & manual
Change-Id: I9c0efdd195b367b0744685e5d001ff4e23b55408
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
index 6558c87a..f7132e3 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
@@ -3237,7 +3237,7 @@
}
private final class UpgradeController {
- private static final int SETTINGS_VERSION = 180;
+ private static final int SETTINGS_VERSION = 181;
private final int mUserId;
@@ -4401,6 +4401,25 @@
currentVersion = 180;
}
+ if (currentVersion == 180) {
+ // Version 180: Set the default value for Secure Settings: AWARE_LOCK_ENABLED
+
+ final SettingsState secureSettings = getSecureSettingsLocked(userId);
+
+ final Setting awareLockEnabled = secureSettings.getSettingLocked(
+ Secure.AWARE_LOCK_ENABLED);
+
+ if (awareLockEnabled.isNull()) {
+ final boolean defAwareLockEnabled = getContext().getResources().getBoolean(
+ R.bool.def_aware_lock_enabled);
+ secureSettings.insertSettingLocked(
+ Secure.AWARE_LOCK_ENABLED, defAwareLockEnabled ? "1" : "0",
+ null, true, SettingsState.SYSTEM_PACKAGE_NAME);
+ }
+
+ currentVersion = 181;
+ }
+
// vXXX: Add new settings above this point.
if (currentVersion != newVersion) {