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

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

Merge "[SettingsProvider] only increment generation of unset settings if new... 

Merge "[SettingsProvider] only increment generation of unset settings if new setting is non-predefined" into udc-dev
parents c722618a c835bf54

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

+6 −6
Original line number Diff line number Diff line
@@ -3056,11 +3056,11 @@ public class SettingsProvider extends ContentProvider { 
            final int key = makeKey(type, userId);



            boolean success = false;

            boolean isNewSetting = false;

            boolean wasUnsetNonPredefinedSetting = false;

            SettingsState settingsState = peekSettingsStateLocked(key);

            if (settingsState != null) {

                if (!settingsState.hasSetting(name)) {

                    isNewSetting = true;

                if (!isSettingPreDefined(name, type) && !settingsState.hasSetting(name)) {

                    wasUnsetNonPredefinedSetting = true;

                }

                success = settingsState.insertSettingLocked(name, value,

                        tag, makeDefault, forceNonSystemPackage, packageName,
@@ -3073,9 +3073,9 @@ public class SettingsProvider extends ContentProvider { 


            if (forceNotify || success) {

                notifyForSettingsChange(key, name);

                if (isNewSetting && !isSettingPreDefined(name, type)) {

                    // Increment the generation number for all null settings because a new

                    // non-predefined setting has been inserted

                if (wasUnsetNonPredefinedSetting) {

                    // Increment the generation number for all non-predefined, unset settings,

                    // because a new non-predefined setting has been inserted

                    mGenerationRegistry.incrementGenerationForUnsetSettings(key);

                }

            }