Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Maintain the users current value for STATUS_BAR_SHOW_VIBRATE_ICON" am: 6f9b963a27

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2265149

Change-Id: Iac8ba84efed3d1ef62baa13e45d72bc6a10ccdd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Song Chun Fan
2022-10-26 19:12:41 +00:00
committed by Automerger Merge Worker
parent 55baa35125 6f9b963a27
commit b8b489d24c
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java
View File

@@ -5514,6 +5514,9 @@ public class SettingsProvider extends ContentProvider {
} }
if (currentVersion == 210) { if (currentVersion == 210) {
final SettingsState secureSettings = getSecureSettingsLocked(userId); final SettingsState secureSettings = getSecureSettingsLocked(userId);
final Setting currentSetting = secureSettings.getSettingLocked(
Secure.STATUS_BAR_SHOW_VIBRATE_ICON);
if (currentSetting.isNull()) {
final int defaultValueVibrateIconEnabled = getContext().getResources() final int defaultValueVibrateIconEnabled = getContext().getResources()
.getInteger(R.integer.def_statusBarVibrateIconEnabled); .getInteger(R.integer.def_statusBarVibrateIconEnabled);
secureSettings.insertSettingOverrideableByRestoreLocked( secureSettings.insertSettingOverrideableByRestoreLocked(
@@ -5521,6 +5524,7 @@ public class SettingsProvider extends ContentProvider {
String.valueOf(defaultValueVibrateIconEnabled), String.valueOf(defaultValueVibrateIconEnabled),
null /* tag */, true /* makeDefault */, null /* tag */, true /* makeDefault */,
SettingsState.SYSTEM_PACKAGE_NAME); SettingsState.SYSTEM_PACKAGE_NAME);
}
currentVersion = 211; currentVersion = 211;
} }
// vXXX: Add new settings above this point. // vXXX: Add new settings above this point.