diff options
| author | 2019-05-07 18:53:31 +0800 | |
|---|---|---|
| committer | 2019-05-07 18:53:31 +0800 | |
| commit | dabc41e734a93ffacc780cdaf4cf3e28576b98d3 (patch) | |
| tree | d0b541139daac17f3f0edb465c9548bc732ccc0d | |
| parent | 4f4df1d7555621fe0e89daa1a4dc97f7ee0f7bea (diff) | |
Set the default value for Secure Settings: SKIP_GESTURE & SILENCE_GESTURE
Bug: 131127449
Test: rebuild & manual test
Change-Id: I57ca610937a52419a6782d9bfa2a05a3daf27bb1
| -rw-r--r-- | packages/SettingsProvider/res/values/defaults.xml | 6 | ||||
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java | 33 |
2 files changed, 38 insertions, 1 deletions
diff --git a/packages/SettingsProvider/res/values/defaults.xml b/packages/SettingsProvider/res/values/defaults.xml index 348f01eaa004..715e1ebe31ac 100644 --- a/packages/SettingsProvider/res/values/defaults.xml +++ b/packages/SettingsProvider/res/values/defaults.xml @@ -229,4 +229,10 @@ <!-- Default for Settings.Secure.AWARE_ENABLED --> <bool name="def_aware_enabled">false</bool> + + <!-- Default for Settings.Secure.SKIP_GESTURE --> + <bool name="def_skip_gesture">false</bool> + + <!-- Default for Settings.Secure.SILENCE_GESTURE --> + <bool name="def_silence_gesture">false</bool> </resources> diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 2f3a42fdcc3f..82592ceeb710 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 @@ public class SettingsProvider extends ContentProvider { } private final class UpgradeController { - private static final int SETTINGS_VERSION = 178; + private static final int SETTINGS_VERSION = 179; private final int mUserId; @@ -4356,6 +4356,37 @@ public class SettingsProvider extends ContentProvider { currentVersion = 178; } + if (currentVersion == 178) { + // Version 178: Set the default value for Secure Settings: + // SKIP_GESTURE & SILENCE_GESTURE + + final SettingsState secureSettings = getSecureSettingsLocked(userId); + + final Setting skipGesture = secureSettings.getSettingLocked( + Secure.SKIP_GESTURE); + + if (skipGesture.isNull()) { + final boolean defSkipGesture = getContext().getResources().getBoolean( + R.bool.def_skip_gesture); + secureSettings.insertSettingLocked( + Secure.SKIP_GESTURE, defSkipGesture ? "1" : "0", + null, true, SettingsState.SYSTEM_PACKAGE_NAME); + } + + final Setting silenceGesture = secureSettings.getSettingLocked( + Secure.SILENCE_GESTURE); + + if (silenceGesture.isNull()) { + final boolean defSilenceGesture = getContext().getResources().getBoolean( + R.bool.def_silence_gesture); + secureSettings.insertSettingLocked( + Secure.SILENCE_GESTURE, defSilenceGesture ? "1" : "0", + null, true, SettingsState.SYSTEM_PACKAGE_NAME); + } + + currentVersion = 179; + } + // vXXX: Add new settings above this point. |