Merge "Propagate individual aconfig sysprop on flag stage" into main (1dd87ad1) · Commits · e / os / android_frameworks_base

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

+18 −0

Original line number	Diff line number	Diff line
		@@ -3265,6 +3265,24 @@ public class SettingsProvider extends ContentProvider {

		if (forceNotify \|\| success) {
		notifyForSettingsChange(key, name);

		// If this is an aconfig flag, it will be written as a staged flag.
		// Notify that its staged flag value will be updated.
		if (Flags.notifyIndividualAconfigSyspropChanged() && type == SETTINGS_TYPE_CONFIG) {
		int slashIndex = name.indexOf('/');
		boolean validSlashIndex = slashIndex != -1
		&& slashIndex != 0
		&& slashIndex != name.length();
		if (validSlashIndex) {
		String namespace = name.substring(0, slashIndex);
		String flagName = name.substring(slashIndex + 1);
		if (settingsState.getAconfigDefaultFlags().containsKey(flagName)) {
		String stagedName = "staged/" + namespace + "*" + flagName;
		notifyForSettingsChange(key, stagedName);
		}
		}
		}

		if (wasUnsetNonPredefinedSetting) {
		// Increment the generation number for all non-predefined, unset settings,
		// because a new non-predefined setting has been inserted

+11 −0

Original line number	Diff line number	Diff line
		@@ -27,6 +27,17 @@ flag {
		}
		}

		flag {
		name: "notify_individual_aconfig_sysprop_changed"
		namespace: "core_experiments_team_internal"
		description: "When enabled, propagate individual aconfig sys props on flag stage."
		bug: "331963764"
		is_fixed_read_only: true
		metadata {
		purpose: PURPOSE_BUGFIX
		}
		}

		flag {
		name: "load_apex_aconfig_protobufs"
		namespace: "core_experiments_team_internal"