StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Liana Kazanova
2024-07-03 18:15:27 +00:00
committed by Gerrit Code Review
parent 8d3b98e1ca 8450f57c3e
commit d7343203b6
2 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/aconfig/aconfig/src/codegen/java.rs
View File

@@ -482,7 +482,7 @@ mod tests {
.unwrap(); .unwrap();
let expect_flags_content = EXPECTED_FLAG_COMMON_CONTENT.to_string() let expect_flags_content = EXPECTED_FLAG_COMMON_CONTENT.to_string()
+ r#" + r#"
private static final FeatureFlags FEATURE_FLAGS = new FeatureFlagsImpl(); private static FeatureFlags FEATURE_FLAGS = new FeatureFlagsImpl();
}"#; }"#;
let expect_featureflagsimpl_content = r#" let expect_featureflagsimpl_content = r#"
@@ -670,7 +670,7 @@ mod tests {
public static boolean enabledRoExported() { public static boolean enabledRoExported() {
return FEATURE_FLAGS.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() { public static boolean enabledRw() {
return FEATURE_FLAGS.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#" let expect_customfeatureflags_content = r#"

7
tools/aconfig/aconfig/templates/Flags.java.template
View File

@@ -33,11 +33,8 @@ public final class Flags \{
public static void unsetFeatureFlags() \{ public static void unsetFeatureFlags() \{
Flags.FEATURE_FLAGS = null; Flags.FEATURE_FLAGS = null;
} }
private static FeatureFlags FEATURE_FLAGS;
{{ -else }}
private static final FeatureFlags FEATURE_FLAGS = new FeatureFlagsImpl();
{{ -endif }} {{ -endif }}
private static FeatureFlags FEATURE_FLAGS{{ -if not is_test_mode }} = new FeatureFlagsImpl(){{ -endif- }};
} }