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

aconfig: add @UnsupportedAppUsage to methods in generated flags

Browse Source 
The java generated flags are marked as @hide which breaks CTS. To
unblock CTS test add @UnsupportedAppUsage to expose the methods.

Test: atest aconfig.test.flags
Bug: 301272559
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:64ad75f50ae96f9a8b57a9e8f88ae9a53d3c1044)
Merged-In: I897573c054e70fc6e093869ba6d416c38f81e28f
Change-Id: I897573c054e70fc6e093869ba6d416c38f81e28f
This commit is contained in:
Zhi Dou
2023-10-06 07:28:44 +00:00
committed by Android Build Cherrypicker Worker
parent e52ce13e82
commit 22a90f4f10
5 changed files with 49 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -118,21 +118,30 @@ mod tests {
const EXPECTED_FEATUREFLAGS_COMMON_CONTENT: &str = r#" const EXPECTED_FEATUREFLAGS_COMMON_CONTENT: &str = r#"
package com.android.aconfig.test; package com.android.aconfig.test;
// TODO(b/303773055): Remove the annotation after access issue is resolved.
import android.compat.annotation.UnsupportedAppUsage;
/** @hide */ /** @hide */
public interface FeatureFlags { public interface FeatureFlags {
@com.android.aconfig.annotations.AssumeFalseForR8 @com.android.aconfig.annotations.AssumeFalseForR8
@UnsupportedAppUsage
boolean disabledRo(); boolean disabledRo();
@UnsupportedAppUsage
boolean disabledRw(); boolean disabledRw();
@com.android.aconfig.annotations.AssumeTrueForR8 @com.android.aconfig.annotations.AssumeTrueForR8
@UnsupportedAppUsage
boolean enabledFixedRo(); boolean enabledFixedRo();
@com.android.aconfig.annotations.AssumeTrueForR8 @com.android.aconfig.annotations.AssumeTrueForR8
@UnsupportedAppUsage
boolean enabledRo(); boolean enabledRo();
@UnsupportedAppUsage
boolean enabledRw(); boolean enabledRw();
} }
"#; "#;
const EXPECTED_FLAG_COMMON_CONTENT: &str = r#" const EXPECTED_FLAG_COMMON_CONTENT: &str = r#"
package com.android.aconfig.test; package com.android.aconfig.test;
// TODO(b/303773055): Remove the annotation after access issue is resolved.
import android.compat.annotation.UnsupportedAppUsage;
/** @hide */ /** @hide */
public final class Flags { public final class Flags {
/** @hide */ /** @hide */
@@ -147,20 +156,25 @@ mod tests {
public static final String FLAG_ENABLED_RW = "com.android.aconfig.test.enabled_rw"; public static final String FLAG_ENABLED_RW = "com.android.aconfig.test.enabled_rw";
@com.android.aconfig.annotations.AssumeFalseForR8 @com.android.aconfig.annotations.AssumeFalseForR8
@UnsupportedAppUsage
public static boolean disabledRo() { public static boolean disabledRo() {
return FEATURE_FLAGS.disabledRo(); return FEATURE_FLAGS.disabledRo();
} }
@UnsupportedAppUsage
public static boolean disabledRw() { public static boolean disabledRw() {
return FEATURE_FLAGS.disabledRw(); return FEATURE_FLAGS.disabledRw();
} }
@com.android.aconfig.annotations.AssumeTrueForR8 @com.android.aconfig.annotations.AssumeTrueForR8
@UnsupportedAppUsage
public static boolean enabledFixedRo() { public static boolean enabledFixedRo() {
return FEATURE_FLAGS.enabledFixedRo(); return FEATURE_FLAGS.enabledFixedRo();
} }
@com.android.aconfig.annotations.AssumeTrueForR8 @com.android.aconfig.annotations.AssumeTrueForR8
@UnsupportedAppUsage
public static boolean enabledRo() { public static boolean enabledRo() {
return FEATURE_FLAGS.enabledRo(); return FEATURE_FLAGS.enabledRo();
} }
@UnsupportedAppUsage
public static boolean enabledRw() { public static boolean enabledRw() {
return FEATURE_FLAGS.enabledRw(); return FEATURE_FLAGS.enabledRw();
} }
@@ -168,6 +182,8 @@ mod tests {
const EXPECTED_FAKEFEATUREFLAGSIMPL_CONTENT: &str = r#" const EXPECTED_FAKEFEATUREFLAGSIMPL_CONTENT: &str = r#"
package com.android.aconfig.test; package com.android.aconfig.test;
// TODO(b/303773055): Remove the annotation after access issue is resolved.
import android.compat.annotation.UnsupportedAppUsage;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
/** @hide */ /** @hide */
@@ -176,22 +192,27 @@ mod tests {
resetAll(); resetAll();
} }
@Override @Override
@UnsupportedAppUsage
public boolean disabledRo() { public boolean disabledRo() {
return getValue(Flags.FLAG_DISABLED_RO); return getValue(Flags.FLAG_DISABLED_RO);
} }
@Override @Override
@UnsupportedAppUsage
public boolean disabledRw() { public boolean disabledRw() {
return getValue(Flags.FLAG_DISABLED_RW); return getValue(Flags.FLAG_DISABLED_RW);
} }
@Override @Override
@UnsupportedAppUsage
public boolean enabledFixedRo() { public boolean enabledFixedRo() {
return getValue(Flags.FLAG_ENABLED_FIXED_RO); return getValue(Flags.FLAG_ENABLED_FIXED_RO);
} }
@Override @Override
@UnsupportedAppUsage
public boolean enabledRo() { public boolean enabledRo() {
return getValue(Flags.FLAG_ENABLED_RO); return getValue(Flags.FLAG_ENABLED_RO);
} }
@Override @Override
@UnsupportedAppUsage
public boolean enabledRw() { public boolean enabledRw() {
return getValue(Flags.FLAG_ENABLED_RW); return getValue(Flags.FLAG_ENABLED_RW);
} }
@@ -241,14 +262,18 @@ mod tests {
let expect_featureflagsimpl_content = r#" let expect_featureflagsimpl_content = r#"
package com.android.aconfig.test; package com.android.aconfig.test;
// TODO(b/303773055): Remove the annotation after access issue is resolved.
import android.compat.annotation.UnsupportedAppUsage;
import android.provider.DeviceConfig; import android.provider.DeviceConfig;
/** @hide */ /** @hide */
public final class FeatureFlagsImpl implements FeatureFlags { public final class FeatureFlagsImpl implements FeatureFlags {
@Override @Override
@UnsupportedAppUsage
public boolean disabledRo() { public boolean disabledRo() {
return false; return false;
} }
@Override @Override
@UnsupportedAppUsage
public boolean disabledRw() { public boolean disabledRw() {
return getValue( return getValue(
"aconfig_test", "aconfig_test",
@@ -257,14 +282,17 @@ mod tests {
); );
} }
@Override @Override
@UnsupportedAppUsage
public boolean enabledFixedRo() { public boolean enabledFixedRo() {
return true; return true;
} }
@Override @Override
@UnsupportedAppUsage
public boolean enabledRo() { public boolean enabledRo() {
return true; return true;
} }
@Override @Override
@UnsupportedAppUsage
public boolean enabledRw() { public boolean enabledRw() {
return getValue( return getValue(
"aconfig_test", "aconfig_test",
@@ -346,29 +374,36 @@ mod tests {
"#; "#;
let expect_featureflagsimpl_content = r#" let expect_featureflagsimpl_content = r#"
package com.android.aconfig.test; package com.android.aconfig.test;
// TODO(b/303773055): Remove the annotation after access issue is resolved.
import android.compat.annotation.UnsupportedAppUsage;
/** @hide */ /** @hide */
public final class FeatureFlagsImpl implements FeatureFlags { public final class FeatureFlagsImpl implements FeatureFlags {
@Override @Override
@UnsupportedAppUsage
public boolean disabledRo() { public boolean disabledRo() {
throw new UnsupportedOperationException( throw new UnsupportedOperationException(
"Method is not implemented."); "Method is not implemented.");
} }
@Override @Override
@UnsupportedAppUsage
public boolean disabledRw() { public boolean disabledRw() {
throw new UnsupportedOperationException( throw new UnsupportedOperationException(
"Method is not implemented."); "Method is not implemented.");
} }
@Override @Override
@UnsupportedAppUsage
public boolean enabledFixedRo() { public boolean enabledFixedRo() {
throw new UnsupportedOperationException( throw new UnsupportedOperationException(
"Method is not implemented."); "Method is not implemented.");
} }
@Override @Override
@UnsupportedAppUsage
public boolean enabledRo() { public boolean enabledRo() {
throw new UnsupportedOperationException( throw new UnsupportedOperationException(
"Method is not implemented."); "Method is not implemented.");
} }
@Override @Override
@UnsupportedAppUsage
public boolean enabledRw() { public boolean enabledRw() {
throw new UnsupportedOperationException( throw new UnsupportedOperationException(
"Method is not implemented."); "Method is not implemented.");

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

@@ -1,4 +1,6 @@
package {package_name}; package {package_name};
// TODO(b/303773055): Remove the annotation after access issue is resolved.
import android.compat.annotation.UnsupportedAppUsage;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
@@ -11,6 +13,7 @@ public class FakeFeatureFlagsImpl implements FeatureFlags \{
{{ for item in class_elements}} {{ for item in class_elements}}
@Override @Override
@UnsupportedAppUsage
public boolean {item.method_name}() \{ public boolean {item.method_name}() \{
return getValue(Flags.FLAG_{item.flag_name_constant_suffix}); return getValue(Flags.FLAG_{item.flag_name_constant_suffix});
} }

3
tools/aconfig/templates/FeatureFlags.java.template
View File

@@ -1,4 +1,6 @@
package {package_name}; package {package_name};
// TODO(b/303773055): Remove the annotation after access issue is resolved.
import android.compat.annotation.UnsupportedAppUsage;
/** @hide */ /** @hide */
public interface FeatureFlags \{ public interface FeatureFlags \{
@@ -10,6 +12,7 @@ public interface FeatureFlags \{
@com.android.aconfig.annotations.AssumeFalseForR8 @com.android.aconfig.annotations.AssumeFalseForR8
{{ -endif- }} {{ -endif- }}
{{ endif }} {{ endif }}
@UnsupportedAppUsage
boolean {item.method_name}(); boolean {item.method_name}();
{{ endfor }} {{ endfor }}
} }

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

@@ -1,4 +1,6 @@
package {package_name}; package {package_name};
// TODO(b/303773055): Remove the annotation after access issue is resolved.
import android.compat.annotation.UnsupportedAppUsage;
{{ if not is_test_mode }} {{ if not is_test_mode }}
{{ if is_read_write- }} {{ if is_read_write- }}
import android.provider.DeviceConfig; import android.provider.DeviceConfig;
@@ -7,6 +9,7 @@ import android.provider.DeviceConfig;
public final class FeatureFlagsImpl implements FeatureFlags \{ public final class FeatureFlagsImpl implements FeatureFlags \{
{{ for item in class_elements}} {{ for item in class_elements}}
@Override @Override
@UnsupportedAppUsage
public boolean {item.method_name}() \{ public boolean {item.method_name}() \{
{{ -if item.is_read_write }} {{ -if item.is_read_write }}
return getValue( return getValue(
@@ -49,6 +52,7 @@ public final class FeatureFlagsImpl implements FeatureFlags \{
public final class FeatureFlagsImpl implements FeatureFlags \{ public final class FeatureFlagsImpl implements FeatureFlags \{
{{ for item in class_elements}} {{ for item in class_elements}}
@Override @Override
@UnsupportedAppUsage
public boolean {item.method_name}() \{ public boolean {item.method_name}() \{
throw new UnsupportedOperationException( throw new UnsupportedOperationException(
"Method is not implemented."); "Method is not implemented.");

4
tools/aconfig/templates/Flags.java.template
View File

@@ -1,5 +1,8 @@
package {package_name}; package {package_name};
// TODO(b/303773055): Remove the annotation after access issue is resolved.
import android.compat.annotation.UnsupportedAppUsage;
/** @hide */ /** @hide */
public final class Flags \{ public final class Flags \{
{{- for item in class_elements}} {{- for item in class_elements}}
@@ -14,6 +17,7 @@ public final class Flags \{
@com.android.aconfig.annotations.AssumeFalseForR8 @com.android.aconfig.annotations.AssumeFalseForR8
{{ -endif- }} {{ -endif- }}
{{ endif }} {{ endif }}
@UnsupportedAppUsage
public static boolean {item.method_name}() \{ public static boolean {item.method_name}() \{
return FEATURE_FLAGS.{item.method_name}(); return FEATURE_FLAGS.{item.method_name}();
} }