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

Commit a9444602 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Propagate individual aconfig sysprop on flag stage" into main am: 1dd87ad1 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3255616



Change-Id: I133f1364fea55cfc73237cafcf0425ebfc4a1492
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6276a30a 1dd87ad1

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

packages/SettingsProvider/src/com/android/providers/settings/device_config_service.aconfig

+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"