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
This commit is contained in:
committed by
Ed Savage-Jones
parent
00c792bba0
commit
dad059300d
@@ -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.
|
||||
|
||||
Reference in New Issue
Block a user