Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3d960c56 authored by Zhi Dou's avatar Zhi Dou Committed by Gerrit Code Review
Browse files

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

parents 39020e05 36589bc3
Loading
Loading
Loading
Loading
+3 −3
Original line number Diff line number Diff line
@@ -518,8 +518,8 @@ mod tests {
        let expected_featureflagsmpl_content_1 = r#"
        /** @hide */
        public final class FeatureFlagsImpl implements FeatureFlags {
            private static boolean aconfig_test_is_cached = false;
            private static boolean other_namespace_is_cached = false;
            private static volatile boolean aconfig_test_is_cached = false;
            private static volatile boolean other_namespace_is_cached = false;
            private static boolean disabledRw = false;
            private static boolean disabledRwExported = false;
            private static boolean disabledRwInOtherNamespace = false;
@@ -886,7 +886,7 @@ mod tests {
        import android.provider.DeviceConfig.Properties;
        /** @hide */
        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 enabledFixedRoExported = false;
            private static boolean enabledRoExported = false;
+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import android.util.Log;
public final class FeatureFlagsImpl implements FeatureFlags \{
{{ -if runtime_lookup_required }}
{{ -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- }}

{{ for flag in flag_elements }}