Merge "Revert "Mark FeatureFlags impl member as final"" into main (d7343203) · Commits · e / os / android_build

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#"

+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- }};

		}