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

Commit cbb9e0c7 authored by Zhi Dou's avatar Zhi Dou Committed by Automerger Merge Worker
Browse files

Merge "aconfig: change Map.of to Map.ofEntries in FakeFeatureFlagsImp" into... 

Merge "aconfig: change Map.of to Map.ofEntries in FakeFeatureFlagsImp" into main am: d61f2efd am: 77cb4d46

Original change: https://android-review.googlesource.com/c/platform/build/+/2768479



Change-Id: Ibf13b8f8e60563d979037e06eef1fde4a9c50da2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3e3b687d 77cb4d46

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 }}

        )

    );