Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8b489d2 authored by Song Chun Fan's avatar Song Chun Fan Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Iac8ba84efed3d1ef62baa13e45d72bc6a10ccdd6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 55baa351 6f9b963a

packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java

+11 −7
Original line number Diff line number Diff line
@@ -5514,6 +5514,9 @@ public class SettingsProvider extends ContentProvider { 
                }

                if (currentVersion == 210) {

                    final SettingsState secureSettings = getSecureSettingsLocked(userId);

                    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(
@@ -5521,6 +5524,7 @@ public class SettingsProvider extends ContentProvider { 
                                String.valueOf(defaultValueVibrateIconEnabled),

                                null /* tag */, true /* makeDefault */,

                                SettingsState.SYSTEM_PACKAGE_NAME);

                    }

                    currentVersion = 211;

                }

                // vXXX: Add new settings above this point.