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

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

Merge "Mark FeatureFlags impl member as final" into main am: 8d3b98e1 am: 4488b976 

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



Change-Id: I42339ea377df896c8a658c3ddc1770023d48f8e5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f0b0b8b7 4488b976

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

+3 −3
Original line number Diff line number Diff line
@@ -482,7 +482,7 @@ mod tests { 
                .unwrap();

        let expect_flags_content = EXPECTED_FLAG_COMMON_CONTENT.to_string()

            + r#"

            private static FeatureFlags FEATURE_FLAGS = new FeatureFlagsImpl();

            private static final FeatureFlags FEATURE_FLAGS = new FeatureFlagsImpl();

        }"#;



        let expect_featureflagsimpl_content = r#"
@@ -670,7 +670,7 @@ mod tests { 
            public static boolean enabledRoExported() {

                return FEATURE_FLAGS.enabledRoExported();

            }

            private static FeatureFlags FEATURE_FLAGS = new FeatureFlagsImpl();

            private static final FeatureFlags FEATURE_FLAGS = new FeatureFlagsImpl();

        }

        "#;
@@ -1092,7 +1092,7 @@ mod tests { 
            public static boolean enabledRw() {

                return FEATURE_FLAGS.enabledRw();

            }

            private static FeatureFlags FEATURE_FLAGS = new FeatureFlagsImpl();

            private static final FeatureFlags FEATURE_FLAGS = new FeatureFlagsImpl();

        }"#;



        let expect_customfeatureflags_content = r#"

tools/aconfig/aconfig/templates/Flags.java.template

+5 −2
Original line number Diff line number Diff line
@@ -33,8 +33,11 @@ public final class Flags \{ 
    public static void unsetFeatureFlags() \{

        Flags.FEATURE_FLAGS = null;

    }

{{ -endif }}



    private static FeatureFlags FEATURE_FLAGS{{ -if not is_test_mode }} = new FeatureFlagsImpl(){{ -endif- }};

    private static FeatureFlags FEATURE_FLAGS;

{{ -else }}



    private static final FeatureFlags FEATURE_FLAGS = new FeatureFlagsImpl();

{{ -endif }}



}