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

Commit 22a90f4f authored by Zhi Dou's avatar Zhi Dou Committed by Android Build Cherrypicker Worker
Browse files

aconfig: add @UnsupportedAppUsage to methods in generated flags 

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
parent e52ce13e

tools/aconfig/src/codegen_java.rs

+35 −0
Original line number Diff line number Diff line
@@ -118,21 +118,30 @@ mod tests { 


    const EXPECTED_FEATUREFLAGS_COMMON_CONTENT: &str = r#"

    package com.android.aconfig.test;

    // TODO(b/303773055): Remove the annotation after access issue is resolved.

    import android.compat.annotation.UnsupportedAppUsage;

    /** @hide */

    public interface FeatureFlags {

        @com.android.aconfig.annotations.AssumeFalseForR8

        @UnsupportedAppUsage

        boolean disabledRo();

        @UnsupportedAppUsage

        boolean disabledRw();

        @com.android.aconfig.annotations.AssumeTrueForR8

        @UnsupportedAppUsage

        boolean enabledFixedRo();

        @com.android.aconfig.annotations.AssumeTrueForR8

        @UnsupportedAppUsage

        boolean enabledRo();

        @UnsupportedAppUsage

        boolean enabledRw();

    }

    "#;



    const EXPECTED_FLAG_COMMON_CONTENT: &str = r#"

    package com.android.aconfig.test;

    // TODO(b/303773055): Remove the annotation after access issue is resolved.

    import android.compat.annotation.UnsupportedAppUsage;

    /** @hide */

    public final class Flags {

        /** @hide */
@@ -147,20 +156,25 @@ mod tests { 
        public static final String FLAG_ENABLED_RW = "com.android.aconfig.test.enabled_rw";



        @com.android.aconfig.annotations.AssumeFalseForR8

        @UnsupportedAppUsage

        public static boolean disabledRo() {

            return FEATURE_FLAGS.disabledRo();

        }

        @UnsupportedAppUsage

        public static boolean disabledRw() {

            return FEATURE_FLAGS.disabledRw();

        }

        @com.android.aconfig.annotations.AssumeTrueForR8

        @UnsupportedAppUsage

        public static boolean enabledFixedRo() {

            return FEATURE_FLAGS.enabledFixedRo();

        }

        @com.android.aconfig.annotations.AssumeTrueForR8

        @UnsupportedAppUsage

        public static boolean enabledRo() {

            return FEATURE_FLAGS.enabledRo();

        }

        @UnsupportedAppUsage

        public static boolean enabledRw() {

            return FEATURE_FLAGS.enabledRw();

        }
@@ -168,6 +182,8 @@ mod tests { 


    const EXPECTED_FAKEFEATUREFLAGSIMPL_CONTENT: &str = r#"

    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.Map;

    /** @hide */
@@ -176,22 +192,27 @@ mod tests { 
            resetAll();

        }

        @Override

        @UnsupportedAppUsage

        public boolean disabledRo() {

            return getValue(Flags.FLAG_DISABLED_RO);

        }

        @Override

        @UnsupportedAppUsage

        public boolean disabledRw() {

            return getValue(Flags.FLAG_DISABLED_RW);

        }

        @Override

        @UnsupportedAppUsage

        public boolean enabledFixedRo() {

            return getValue(Flags.FLAG_ENABLED_FIXED_RO);

        }

        @Override

        @UnsupportedAppUsage

        public boolean enabledRo() {

            return getValue(Flags.FLAG_ENABLED_RO);

        }

        @Override

        @UnsupportedAppUsage

        public boolean enabledRw() {

            return getValue(Flags.FLAG_ENABLED_RW);

        }
@@ -241,14 +262,18 @@ mod tests { 


        let expect_featureflagsimpl_content = r#"

        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;

        /** @hide */

        public final class FeatureFlagsImpl implements FeatureFlags {

            @Override

            @UnsupportedAppUsage

            public boolean disabledRo() {

                return false;

            }

            @Override

            @UnsupportedAppUsage

            public boolean disabledRw() {

                return getValue(

                    "aconfig_test",
@@ -257,14 +282,17 @@ mod tests { 
                );

            }

            @Override

            @UnsupportedAppUsage

            public boolean enabledFixedRo() {

                return true;

            }

            @Override

            @UnsupportedAppUsage

            public boolean enabledRo() {

                return true;

            }

            @Override

            @UnsupportedAppUsage

            public boolean enabledRw() {

                return getValue(

                    "aconfig_test",
@@ -346,29 +374,36 @@ mod tests { 
        "#;

        let expect_featureflagsimpl_content = r#"

        package com.android.aconfig.test;

        // TODO(b/303773055): Remove the annotation after access issue is resolved.

        import android.compat.annotation.UnsupportedAppUsage;

        /** @hide */

        public final class FeatureFlagsImpl implements FeatureFlags {

            @Override

            @UnsupportedAppUsage

            public boolean disabledRo() {

                throw new UnsupportedOperationException(

                    "Method is not implemented.");

            }

            @Override

            @UnsupportedAppUsage

            public boolean disabledRw() {

                throw new UnsupportedOperationException(

                    "Method is not implemented.");

            }

            @Override

            @UnsupportedAppUsage

            public boolean enabledFixedRo() {

                throw new UnsupportedOperationException(

                    "Method is not implemented.");

            }

            @Override

            @UnsupportedAppUsage

            public boolean enabledRo() {

                throw new UnsupportedOperationException(

                    "Method is not implemented.");

            }

            @Override

            @UnsupportedAppUsage

            public boolean enabledRw() {

                throw new UnsupportedOperationException(

                    "Method is not implemented.");

tools/aconfig/templates/FakeFeatureFlagsImpl.java.template

+3 −0
Original line number Diff line number Diff line 
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.Map;
@@ -11,6 +13,7 @@ public class FakeFeatureFlagsImpl implements FeatureFlags \{ 


{{ for item in class_elements}}

    @Override

    @UnsupportedAppUsage

    public boolean {item.method_name}() \{

        return getValue(Flags.FLAG_{item.flag_name_constant_suffix});

    }

tools/aconfig/templates/FeatureFlags.java.template

+3 −0
Original line number Diff line number Diff line 
package {package_name};

// TODO(b/303773055): Remove the annotation after access issue is resolved.

import android.compat.annotation.UnsupportedAppUsage;



/** @hide */

public interface FeatureFlags \{
@@ -10,6 +12,7 @@ public interface FeatureFlags \{ 
    @com.android.aconfig.annotations.AssumeFalseForR8

{{ -endif- }}

{{ endif }}

    @UnsupportedAppUsage

    boolean {item.method_name}();

{{ endfor }}

}

tools/aconfig/templates/FeatureFlagsImpl.java.template

+4 −0
Original line number Diff line number Diff line 
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 is_read_write- }}

import android.provider.DeviceConfig;
@@ -7,6 +9,7 @@ import android.provider.DeviceConfig; 
public final class FeatureFlagsImpl implements FeatureFlags \{

{{ for item in class_elements}}

    @Override

    @UnsupportedAppUsage

    public boolean {item.method_name}() \{

    {{ -if item.is_read_write }}

        return getValue(
@@ -49,6 +52,7 @@ public final class FeatureFlagsImpl implements FeatureFlags \{ 
public final class FeatureFlagsImpl implements FeatureFlags \{

{{ for item in class_elements}}

    @Override

    @UnsupportedAppUsage

    public boolean {item.method_name}() \{

        throw new UnsupportedOperationException(

            "Method is not implemented.");

tools/aconfig/templates/Flags.java.template

+4 −0
Original line number Diff line number Diff line 
package {package_name};



// TODO(b/303773055): Remove the annotation after access issue is resolved.

import android.compat.annotation.UnsupportedAppUsage;



/** @hide */

public final class Flags \{

{{- for item in class_elements}}
@@ -14,6 +17,7 @@ public final class Flags \{ 
    @com.android.aconfig.annotations.AssumeFalseForR8

{{ -endif- }}

{{ endif }}

    @UnsupportedAppUsage

    public static boolean {item.method_name}() \{

        return FEATURE_FLAGS.{item.method_name}();

    }