diff options
| author | 2022-10-21 13:16:36 +0200 | |
|---|---|---|
| committer | 2022-12-09 12:31:48 -0500 | |
| commit | a19956d62f7dab77a82b5dffac54a351c2bcf11c (patch) | |
| tree | d69979415897c04da8cbbb78aa7bf6b91597752d | |
| parent | 5aad6ff53d8627044d1d71ff94e3a225638969be (diff) | |
Maintain the users current value for STATUS_BAR_SHOW_VIBRATE_ICON
Make sure not to overwrite any current user selection for
Secure.STATUS_BAR_SHOW_VIBRATE_ICON that the user may have
made.
Issue: 253992986
Test: Manual - see issue
Change-Id: I33155a27707e6d30ff56fb090c71b9670a98fc31
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 19bbcff0bd79..ded7e785ca75 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -5514,13 +5514,17 @@ public class SettingsProvider extends ContentProvider { } if (currentVersion == 210) { final SettingsState secureSettings = getSecureSettingsLocked(userId); - final int defaultValueVibrateIconEnabled = getContext().getResources() - .getInteger(R.integer.def_statusBarVibrateIconEnabled); - secureSettings.insertSettingOverrideableByRestoreLocked( - Secure.STATUS_BAR_SHOW_VIBRATE_ICON, - String.valueOf(defaultValueVibrateIconEnabled), - null /* tag */, true /* makeDefault */, - SettingsState.SYSTEM_PACKAGE_NAME); + final Setting currentSetting = secureSettings.getSettingLocked( + Secure.STATUS_BAR_SHOW_VIBRATE_ICON); + if (currentSetting.isNull()) { + final int defaultValueVibrateIconEnabled = getContext().getResources() + .getInteger(R.integer.def_statusBarVibrateIconEnabled); + secureSettings.insertSettingOverrideableByRestoreLocked( + Secure.STATUS_BAR_SHOW_VIBRATE_ICON, + String.valueOf(defaultValueVibrateIconEnabled), + null /* tag */, true /* makeDefault */, + SettingsState.SYSTEM_PACKAGE_NAME); + } currentVersion = 211; } // vXXX: Add new settings above this point. |