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

Merge "aconfig: make java cached indicator volatile" into main

Browse Source
This commit is contained in:
Zhi Dou
2024-07-30 23:35:45 +00:00
committed by Gerrit Code Review
parent 39020e05c6 36589bc318
commit 3d960c5638
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -518,8 +518,8 @@ mod tests {
let expected_featureflagsmpl_content_1 = r#" let expected_featureflagsmpl_content_1 = r#"
/** @hide */ /** @hide */
public final class FeatureFlagsImpl implements FeatureFlags { public final class FeatureFlagsImpl implements FeatureFlags {
private static boolean aconfig_test_is_cached = false; private static volatile boolean aconfig_test_is_cached = false;
private static boolean other_namespace_is_cached = false; private static volatile boolean other_namespace_is_cached = false;
private static boolean disabledRw = false; private static boolean disabledRw = false;
private static boolean disabledRwExported = false; private static boolean disabledRwExported = false;
private static boolean disabledRwInOtherNamespace = false; private static boolean disabledRwInOtherNamespace = false;
@@ -886,7 +886,7 @@ mod tests {
import android.provider.DeviceConfig.Properties; import android.provider.DeviceConfig.Properties;
/** @hide */ /** @hide */
public final class FeatureFlagsImpl implements FeatureFlags { public final class FeatureFlagsImpl implements FeatureFlags {
private static boolean aconfig_test_is_cached = false; private static volatile boolean aconfig_test_is_cached = false;
private static boolean disabledRwExported = false; private static boolean disabledRwExported = false;
private static boolean enabledFixedRoExported = false; private static boolean enabledFixedRoExported = false;
private static boolean enabledRoExported = false; private static boolean enabledRoExported = false;

2
tools/aconfig/aconfig/templates/FeatureFlagsImpl.java.template
View File

@@ -22,7 +22,7 @@ import android.util.Log;
public final class FeatureFlagsImpl implements FeatureFlags \{ public final class FeatureFlagsImpl implements FeatureFlags \{
{{ -if runtime_lookup_required }} {{ -if runtime_lookup_required }}
{{ -for namespace_with_flags in namespace_flags }} {{ -for namespace_with_flags in namespace_flags }}
private static boolean {namespace_with_flags.namespace}_is_cached = false; private static volatile boolean {namespace_with_flags.namespace}_is_cached = false;
{{ -endfor- }} {{ -endfor- }}
{{ for flag in flag_elements }} {{ for flag in flag_elements }}