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

Commit 6f9b963a authored by Song Chun Fan's avatar Song Chun Fan Committed by Gerrit Code Review
Browse files

Merge "Maintain the users current value for STATUS_BAR_SHOW_VIBRATE_ICON"

parents 837b7fce dad05930

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.