From b52465da312523a7491fec3dadeea26bdc834321 Mon Sep 17 00:00:00 2001 From: Zhi Dou Date: Fri, 15 Dec 2023 22:48:16 +0000 Subject: aconfig: add new testing flag enabled_fixed_ro_exported This commit adds a new testing flag enabled_fixed_ro_exported to test the case of a exported and fixed_read_only flag. Test: atest aconfig.test aconfig.test.java AconfigJavaHostTest aconfig.test.cpp aconfig.test.cpp.test_mode aconfig.prod_mode.test.rust Bug: 316357680 Change-Id: Iaedb8a6875166c6a6d24c7c3deee701a496b4964 --- tools/aconfig/src/codegen/java.rs | 53 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) (limited to 'tools/aconfig/src/codegen/java.rs') diff --git a/tools/aconfig/src/codegen/java.rs b/tools/aconfig/src/codegen/java.rs index 1d5dabf9f6..f874b344d7 100644 --- a/tools/aconfig/src/codegen/java.rs +++ b/tools/aconfig/src/codegen/java.rs @@ -202,6 +202,9 @@ mod tests { boolean enabledFixedRo(); @com.android.aconfig.annotations.AssumeTrueForR8 @UnsupportedAppUsage + boolean enabledFixedRoExported(); + @com.android.aconfig.annotations.AssumeTrueForR8 + @UnsupportedAppUsage boolean enabledRo(); @com.android.aconfig.annotations.AssumeTrueForR8 @UnsupportedAppUsage @@ -228,6 +231,8 @@ mod tests { /** @hide */ public static final String FLAG_ENABLED_FIXED_RO = "com.android.aconfig.test.enabled_fixed_ro"; /** @hide */ + public static final String FLAG_ENABLED_FIXED_RO_EXPORTED = "com.android.aconfig.test.enabled_fixed_ro_exported"; + /** @hide */ public static final String FLAG_ENABLED_RO = "com.android.aconfig.test.enabled_ro"; /** @hide */ public static final String FLAG_ENABLED_RO_EXPORTED = "com.android.aconfig.test.enabled_ro_exported"; @@ -258,6 +263,11 @@ mod tests { } @com.android.aconfig.annotations.AssumeTrueForR8 @UnsupportedAppUsage + public static boolean enabledFixedRoExported() { + return FEATURE_FLAGS.enabledFixedRoExported(); + } + @com.android.aconfig.annotations.AssumeTrueForR8 + @UnsupportedAppUsage public static boolean enabledRo() { return FEATURE_FLAGS.enabledRo(); } @@ -310,6 +320,11 @@ mod tests { } @Override @UnsupportedAppUsage + public boolean enabledFixedRoExported() { + return getValue(Flags.FLAG_ENABLED_FIXED_RO_EXPORTED); + } + @Override + @UnsupportedAppUsage public boolean enabledRo() { return getValue(Flags.FLAG_ENABLED_RO); } @@ -348,6 +363,7 @@ mod tests { Map.entry(Flags.FLAG_DISABLED_RW_EXPORTED, false), Map.entry(Flags.FLAG_DISABLED_RW_IN_OTHER_NAMESPACE, false), Map.entry(Flags.FLAG_ENABLED_FIXED_RO, false), + Map.entry(Flags.FLAG_ENABLED_FIXED_RO_EXPORTED, false), Map.entry(Flags.FLAG_ENABLED_RO, false), Map.entry(Flags.FLAG_ENABLED_RO_EXPORTED, false), Map.entry(Flags.FLAG_ENABLED_RW, false) @@ -463,6 +479,11 @@ mod tests { } @Override @UnsupportedAppUsage + public boolean enabledFixedRoExported() { + return true; + } + @Override + @UnsupportedAppUsage public boolean enabledRo() { return true; } @@ -528,6 +549,8 @@ mod tests { /** @hide */ public static final String FLAG_DISABLED_RW_EXPORTED = "com.android.aconfig.test.disabled_rw_exported"; /** @hide */ + public static final String FLAG_ENABLED_FIXED_RO_EXPORTED = "com.android.aconfig.test.enabled_fixed_ro_exported"; + /** @hide */ public static final String FLAG_ENABLED_RO_EXPORTED = "com.android.aconfig.test.enabled_ro_exported"; @UnsupportedAppUsage @@ -535,6 +558,10 @@ mod tests { return FEATURE_FLAGS.disabledRwExported(); } @UnsupportedAppUsage + public static boolean enabledFixedRoExported() { + return FEATURE_FLAGS.enabledFixedRoExported(); + } + @UnsupportedAppUsage public static boolean enabledRoExported() { return FEATURE_FLAGS.enabledRoExported(); } @@ -551,6 +578,8 @@ mod tests { @UnsupportedAppUsage boolean disabledRwExported(); @UnsupportedAppUsage + boolean enabledFixedRoExported(); + @UnsupportedAppUsage boolean enabledRoExported(); } "#; @@ -566,6 +595,7 @@ mod tests { private static boolean aconfig_test_is_cached = false; private static boolean other_namespace_is_cached = false; private static boolean disabledRwExported = false; + private static boolean enabledFixedRoExported = false; private static boolean enabledRoExported = false; @@ -574,6 +604,8 @@ mod tests { Properties properties = DeviceConfig.getProperties("aconfig_test"); disabledRwExported = properties.getBoolean("com.android.aconfig.test.disabled_rw_exported", false); + enabledFixedRoExported = + properties.getBoolean("com.android.aconfig.test.enabled_fixed_ro_exported", false); enabledRoExported = properties.getBoolean("com.android.aconfig.test.enabled_ro_exported", false); } catch (NullPointerException e) { @@ -614,6 +646,15 @@ mod tests { return disabledRwExported; } + @Override + @UnsupportedAppUsage + public boolean enabledFixedRoExported() { + if (!aconfig_test_is_cached) { + load_overrides_aconfig_test(); + } + return enabledFixedRoExported; + } + @Override @UnsupportedAppUsage public boolean enabledRoExported() { @@ -642,6 +683,11 @@ mod tests { } @Override @UnsupportedAppUsage + public boolean enabledFixedRoExported() { + return getValue(Flags.FLAG_ENABLED_FIXED_RO_EXPORTED); + } + @Override + @UnsupportedAppUsage public boolean enabledRoExported() { return getValue(Flags.FLAG_ENABLED_RO_EXPORTED); } @@ -666,6 +712,7 @@ mod tests { private Map mFlagMap = new HashMap<>( Map.ofEntries( Map.entry(Flags.FLAG_DISABLED_RW_EXPORTED, false), + Map.entry(Flags.FLAG_ENABLED_FIXED_RO_EXPORTED, false), Map.entry(Flags.FLAG_ENABLED_RO_EXPORTED, false) ) ); @@ -759,6 +806,12 @@ mod tests { } @Override @UnsupportedAppUsage + public boolean enabledFixedRoExported() { + throw new UnsupportedOperationException( + "Method is not implemented."); + } + @Override + @UnsupportedAppUsage public boolean enabledRo() { throw new UnsupportedOperationException( "Method is not implemented."); -- cgit v1.2.3-59-g8ed1b