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

Commit 8450f57c authored by Liana Kazanova's avatar Liana Kazanova Committed by Gerrit Code Review
Browse files

Revert "Mark FeatureFlags impl member as final" 

This reverts commit fca73bca.

Reason for revert: Droidmonitor triggered revert due to build breakage in b/350978649. Will be verifying through ABTD before submission.

Change-Id: I65de159518597289f1e0e3902080f35970842afc
parent fca73bca

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

+3 −3
Original line number Diff line number Diff line
@@ -473,7 +473,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#"
@@ -661,7 +661,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();

        }

        "#;
@@ -1083,7 +1083,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- }};



}