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

Commit ff5346cd authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Maintain the users current value for STATUS_BAR_SHOW_VIBRATE_ICON" into tm-qpr-dev

parents 56b489b5 a19956d6

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.