From a530ac79e1779eb166343412012ce0d9ec21941b Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Thu, 9 Mar 2023 00:25:03 +0000 Subject: [PATCH] Revert "[SettingsProvider] only increment generation of unset settings if new setting is non-predefined" This reverts commit c835bf549b9cce8bc7872fe9cd0e2acd3bb8b223. Reason for revert: Broken tests: parent identified as culprit for b/271974378#comment6 and b/271947351#comment10 Change-Id: I99b6cc0e51790b41794e42bc75e4ce70060166c6 --- .../android/providers/settings/SettingsProvider.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java index 27c8cdfe98f33..418011acf6f37 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/SettingsProvider.java @@ -3056,11 +3056,11 @@ public class SettingsProvider extends ContentProvider { final int key = makeKey(type, userId); boolean success = false; - boolean wasUnsetNonPredefinedSetting = false; + boolean isNewSetting = false; SettingsState settingsState = peekSettingsStateLocked(key); if (settingsState != null) { - if (!isSettingPreDefined(name, type) && !settingsState.hasSetting(name)) { - wasUnsetNonPredefinedSetting = true; + if (!settingsState.hasSetting(name)) { + isNewSetting = 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 (wasUnsetNonPredefinedSetting) { - // Increment the generation number for all non-predefined, unset settings, - // because a new non-predefined setting has been inserted + if (isNewSetting && !isSettingPreDefined(name, type)) { + // Increment the generation number for all null settings because a new + // non-predefined setting has been inserted mGenerationRegistry.incrementGenerationForUnsetSettings(key); } }