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 am: b8b489d24c am: d8b146c75f

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

Change-Id: I0fb40203bc84d57c81dd63a31ed5bb0db16408dc
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:55:41 +00:00
committed by Automerger Merge Worker
parent 64f044432f d8b146c75f
commit 900dd54f12
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5533,13 +5533,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.