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

Commit 4afc5d7b authored by Mårten Kongstad's avatar Mårten Kongstad Committed by Gerrit Code Review
Browse files

Merge "Revert "aconfig: @hide generated Java code"" into main

parents fd6cd139 c0e8ffea

tools/aconfig/src/codegen_java.rs

+0 −5
Original line number Diff line number Diff line
@@ -118,7 +118,6 @@ mod tests { 


    const EXPECTED_FEATUREFLAGS_COMMON_CONTENT: &str = r#"

    package com.android.aconfig.test;

    /** @hide */

    public interface FeatureFlags {

        @com.android.aconfig.annotations.AssumeFalseForR8

        boolean disabledRo();
@@ -133,7 +132,6 @@ mod tests { 


    const EXPECTED_FLAG_COMMON_CONTENT: &str = r#"

    package com.android.aconfig.test;

    /** @hide */

    public final class Flags {

        public static final String FLAG_DISABLED_RO = "com.android.aconfig.test.disabled_ro";

        public static final String FLAG_DISABLED_RW = "com.android.aconfig.test.disabled_rw";
@@ -165,7 +163,6 @@ mod tests { 
    package com.android.aconfig.test;

    import java.util.HashMap;

    import java.util.Map;

    /** @hide */

    public class FakeFeatureFlagsImpl implements FeatureFlags {

        public FakeFeatureFlagsImpl() {

            resetAll();
@@ -237,7 +234,6 @@ mod tests { 
        let expect_featureflagsimpl_content = r#"

        package com.android.aconfig.test;

        import android.provider.DeviceConfig;

        /** @hide */

        public final class FeatureFlagsImpl implements FeatureFlags {

            @Override

            public boolean disabledRo() {
@@ -320,7 +316,6 @@ mod tests { 
        "#;

        let expect_featureflagsimpl_content = r#"

        package com.android.aconfig.test;

        /** @hide */

        public final class FeatureFlagsImpl implements FeatureFlags {

            @Override

            public boolean disabledRo() {

tools/aconfig/templates/FakeFeatureFlagsImpl.java.template

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ package {package_name}; 
import java.util.HashMap;

import java.util.Map;



/** @hide */

public class FakeFeatureFlagsImpl implements FeatureFlags \{

    public FakeFeatureFlagsImpl() \{

        resetAll();

tools/aconfig/templates/FeatureFlags.java.template

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



/** @hide */

public interface FeatureFlags \{

{{ for item in class_elements}}

{{ -if not item.is_read_write }}

tools/aconfig/templates/FeatureFlagsImpl.java.template

+0 −2
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ package {package_name}; 
{{ if is_read_write- }}

import android.provider.DeviceConfig;

{{ endif }}

/** @hide */

public final class FeatureFlagsImpl implements FeatureFlags \{

{{ for item in class_elements}}

    @Override
@@ -22,7 +21,6 @@ public final class FeatureFlagsImpl implements FeatureFlags \{ 
}

{{ else }}

{#- Generate only stub if in test mode #}

/** @hide */

public final class FeatureFlagsImpl implements FeatureFlags \{

{{ for item in class_elements}}

    @Override

tools/aconfig/templates/Flags.java.template

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



/** @hide */

public final class Flags \{

{{- for item in class_elements}}

    public static final String FLAG_{item.flag_name_constant_suffix} = "{item.device_config_flag}";