Merge "aconfig: change Map.of to Map.ofEntries in FakeFeatureFlagsImp" into main (d61f2efd) · Commits · e / os / android_build

tools/aconfig/src/codegen_java.rs

+6 −6

Original line number	Diff line number	Diff line
		@@ -214,12 +214,12 @@ mod tests {
		return value;
		}
		private Map<String, Boolean> mFlagMap = new HashMap<>(
		Map.of(
		Flags.FLAG_DISABLED_RO, false,
		Flags.FLAG_DISABLED_RW, false,
		Flags.FLAG_ENABLED_FIXED_RO, false,
		Flags.FLAG_ENABLED_RO, false,
		Flags.FLAG_ENABLED_RW, false
		Map.ofEntries(
		Map.entry(Flags.FLAG_DISABLED_RO, false),
		Map.entry(Flags.FLAG_DISABLED_RW, false),
		Map.entry(Flags.FLAG_ENABLED_FIXED_RO, false),
		Map.entry(Flags.FLAG_ENABLED_RO, false),
		Map.entry(Flags.FLAG_ENABLED_RW, false)
		)
		);
		}

+3 −2

Original line number	Diff line number	Diff line
		@@ -37,9 +37,10 @@ public class FakeFeatureFlagsImpl implements FeatureFlags \{
		}

		private Map<String, Boolean> mFlagMap = new HashMap<>(
		Map.of(
		Map.ofEntries(
		{{-for item in class_elements}}
		Flags.FLAG_{item.flag_name_constant_suffix}, false{{ if not @last }},{{ endif }}
		Map.entry(Flags.FLAG_{item.flag_name_constant_suffix}, false)
		{{ -if not @last }},{{ endif }}
		{{ -endfor }}
		)
		);