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

Commit 80c40c4d authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "FakeFeatureFlagsImpl optionally takes defaults via a FeatureFlags." into main

parents d4758185 23fbd1e2

tools/aconfig/aconfig/src/codegen/java.rs

+13 −4
Original line number Diff line number Diff line
@@ -428,10 +428,16 @@ mod tests { 


    /** @hide */

    public class FakeFeatureFlagsImpl extends CustomFeatureFlags {

        private Map<String, Boolean> mFlagMap = new HashMap<>();

        private final Map<String, Boolean> mFlagMap = new HashMap<>();

        private final FeatureFlags mDefaults;



        public FakeFeatureFlagsImpl() {

            this(null);

        }



        public FakeFeatureFlagsImpl(FeatureFlags defaults) {

            super(null);

            mDefaults = defaults;

            // Initialize the map with null values

            for (String flagName : getFlagNames()) {

                mFlagMap.put(flagName, null);
@@ -441,11 +447,14 @@ mod tests { 
        @Override

        protected boolean getValue(String flagName, Predicate<FeatureFlags> getter) {

            Boolean value = this.mFlagMap.get(flagName);

            if (value == null) {

                throw new IllegalArgumentException(flagName + " is not set");

            }

            if (value != null) {

                return value;

            }

            if (mDefaults != null) {

                return getter.test(mDefaults);

            }

            throw new IllegalArgumentException(flagName + " is not set");

        }



        public void setFlag(String flagName, boolean value) {

            if (!this.mFlagMap.containsKey(flagName)) {

tools/aconfig/aconfig/templates/FakeFeatureFlagsImpl.java.template

+13 −4
Original line number Diff line number Diff line
@@ -6,10 +6,16 @@ import java.util.function.Predicate; 


/** @hide */

public class FakeFeatureFlagsImpl extends CustomFeatureFlags \{

    private Map<String, Boolean> mFlagMap = new HashMap<>();

    private final Map<String, Boolean> mFlagMap = new HashMap<>();

    private final FeatureFlags mDefaults;



    public FakeFeatureFlagsImpl() \{

        this(null);

    }



    public FakeFeatureFlagsImpl(FeatureFlags defaults) \{

        super(null);

        mDefaults = defaults;

        // Initialize the map with null values

        for (String flagName : getFlagNames()) \{

            mFlagMap.put(flagName, null);
@@ -19,11 +25,14 @@ public class FakeFeatureFlagsImpl extends CustomFeatureFlags \{ 
    @Override

    protected boolean getValue(String flagName, Predicate<FeatureFlags> getter) \{

        Boolean value = this.mFlagMap.get(flagName);

        if (value == null) \{

            throw new IllegalArgumentException(flagName + " is not set");

        }

        if (value != null) \{

            return value;

        }

        if (mDefaults != null) \{

            return getter.test(mDefaults);

        }

        throw new IllegalArgumentException(flagName + " is not set");

    }



    public void setFlag(String flagName, boolean value) \{

        if (!this.mFlagMap.containsKey(flagName)) \{