commit d7343203b6dc58de6173718db966d4df09098c1d
author Liana Kazanova <lkazanova@google.com> Wed Jul 03 18:15:27 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jul 03 18:15:27 2024 +0000
tree 39b745e1e4e73c8940c4b5b4dc36854bf84eb33b
parent 8d3b98e1cadea9dfe79345939002717fb8527cf2
parent 8450f57c3eb93500bab7eec83b409aabe3e9ba68

Merge "Revert "Mark FeatureFlags impl member as final"" into main

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

diff --git a/tools/aconfig/aconfig/src/codegen/java.rs b/tools/aconfig/aconfig/src/codegen/java.rs
index 4ec6615..d3f074a 100644
--- a/tools/aconfig/aconfig/src/codegen/java.rs
+++ b/tools/aconfig/aconfig/src/codegen/java.rs
@@ -482,7 +482,7 @@
                 .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 @@
             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 @@
             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

diff --git a/tools/aconfig/aconfig/templates/Flags.java.template b/tools/aconfig/aconfig/templates/Flags.java.template
index 2d012f5..e2f70b9 100644
--- a/tools/aconfig/aconfig/templates/Flags.java.template
+++ b/tools/aconfig/aconfig/templates/Flags.java.template
@@ -33,11 +33,8 @@
     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- }};
+
 }