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

Merge "aconfig: change Map.of to Map.ofEntries in FakeFeatureFlagsImp" into main

Browse Source
This commit is contained in:
Zhi Dou
2023-10-03 17:58:22 +00:00
committed by Gerrit Code Review
parent a65cdd5024 b095acbc57
commit d61f2efdbb
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/aconfig/src/codegen_java.rs
View File

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

5
tools/aconfig/templates/FakeFeatureFlagsImpl.java.template
View File

@@ -37,9 +37,10 @@ public class FakeFeatureFlagsImpl implements FeatureFlags \{
} }
private Map<String, Boolean> mFlagMap = new HashMap<>( private Map<String, Boolean> mFlagMap = new HashMap<>(
Map.of( Map.ofEntries(
{{-for item in class_elements}} {{-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 }} {{ -endfor }}
) )
); );