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

Commit d94b32d8 authored by Liana Kazanova's avatar Liana Kazanova Committed by Automerger Merge Worker
Browse files

Merge "Revert "Mark FeatureFlags impl member as final"" into main am: d7343203 

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



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

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 final FeatureFlags FEATURE_FLAGS = new FeatureFlagsImpl();

            private static 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 final FeatureFlags FEATURE_FLAGS = new FeatureFlagsImpl();

            private static FeatureFlags FEATURE_FLAGS = new FeatureFlagsImpl();

        }

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

                return FEATURE_FLAGS.enabledRw();

            }

            private static final FeatureFlags FEATURE_FLAGS = new FeatureFlagsImpl();

            private static FeatureFlags FEATURE_FLAGS = new FeatureFlagsImpl();

        }"#;



        let expect_customfeatureflags_content = r#"

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

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

        Flags.FEATURE_FLAGS = null;

    }



    private static FeatureFlags FEATURE_FLAGS;

{{ -else }}



    private static final FeatureFlags FEATURE_FLAGS = new FeatureFlagsImpl();

{{ -endif }}



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



}