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

Commit b095acbc authored by Zhi Dou's avatar Zhi Dou
Browse files

aconfig: change Map.of to Map.ofEntries in FakeFeatureFlagsImp 

Map.of can only take 10 entries. Map.ofEntries uses variable arguments.

Bug: 303045451
Test: atest AconfigJavaHostTest
Change-Id: I26a3fa0b8a731f9203934d4a800a5c695cfc730f
parent 0d9b3a99

tools/aconfig/src/codegen_java.rs

+6 −6
Original line number Diff line number Diff line
@@ -214,12 +214,12 @@ mod tests { 
            return value;

        }

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

            Map.of(

                Flags.FLAG_DISABLED_RO, false,

                Flags.FLAG_DISABLED_RW, false,

                Flags.FLAG_ENABLED_FIXED_RO, false,

                Flags.FLAG_ENABLED_RO, false,

                Flags.FLAG_ENABLED_RW, false

            Map.ofEntries(

                Map.entry(Flags.FLAG_DISABLED_RO, false),

                Map.entry(Flags.FLAG_DISABLED_RW, false),

                Map.entry(Flags.FLAG_ENABLED_FIXED_RO, false),

                Map.entry(Flags.FLAG_ENABLED_RO, false),

                Map.entry(Flags.FLAG_ENABLED_RW, false)

            )

        );

    }

tools/aconfig/templates/FakeFeatureFlagsImpl.java.template

+3 −2
Original line number Diff line number Diff line
@@ -37,9 +37,10 @@ public class FakeFeatureFlagsImpl implements FeatureFlags \{ 
    }



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

        Map.of(

        Map.ofEntries(

            {{-for item in class_elements}}

            Flags.FLAG_{item.flag_name_constant_suffix}, false{{ if not @last }},{{ endif }}

            Map.entry(Flags.FLAG_{item.flag_name_constant_suffix}, false)

            {{ -if not @last }},{{ endif }}

            {{ -endfor }}

        )

    );