From c0e8ffea41306eedf099866ccd8e4c28851a0b3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5rten=20Kongstad?= <amhk@google.com>
Date: Mon, 11 Sep 2023 11:00:42 +0000
Subject: [PATCH] Revert "aconfig: @hide generated Java code"

This reverts commit 379e09d157fcb9f4248deb934a80176c8ffb2663.

Reason for revert: Seems to have broken the build. Reverting while investigating.

Change-Id: I37c9a065853ef07b1f1c18355205a2f49dd816c4
---
 tools/aconfig/src/codegen_java.rs                          | 5 -----
 tools/aconfig/templates/FakeFeatureFlagsImpl.java.template | 1 -
 tools/aconfig/templates/FeatureFlags.java.template         | 1 -
 tools/aconfig/templates/FeatureFlagsImpl.java.template     | 2 --
 tools/aconfig/templates/Flags.java.template                | 1 -
 5 files changed, 10 deletions(-)

diff --git a/tools/aconfig/src/codegen_java.rs b/tools/aconfig/src/codegen_java.rs
index 39b286a13f..c31d715867 100644
--- a/tools/aconfig/src/codegen_java.rs
+++ b/tools/aconfig/src/codegen_java.rs
@@ -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() {
diff --git a/tools/aconfig/templates/FakeFeatureFlagsImpl.java.template b/tools/aconfig/templates/FakeFeatureFlagsImpl.java.template
index d4283d37a2..82bea81f92 100644
--- a/tools/aconfig/templates/FakeFeatureFlagsImpl.java.template
+++ b/tools/aconfig/templates/FakeFeatureFlagsImpl.java.template
@@ -3,7 +3,6 @@ package {package_name};
 import java.util.HashMap;
 import java.util.Map;
 
-/** @hide */
 public class FakeFeatureFlagsImpl implements FeatureFlags \{
     public FakeFeatureFlagsImpl() \{
         resetAll();
diff --git a/tools/aconfig/templates/FeatureFlags.java.template b/tools/aconfig/templates/FeatureFlags.java.template
index 9350d60bec..31cfdfce8d 100644
--- a/tools/aconfig/templates/FeatureFlags.java.template
+++ b/tools/aconfig/templates/FeatureFlags.java.template
@@ -1,6 +1,5 @@
 package {package_name};
 
-/** @hide */
 public interface FeatureFlags \{
 {{ for item in class_elements}}
 {{ -if not item.is_read_write }}
diff --git a/tools/aconfig/templates/FeatureFlagsImpl.java.template b/tools/aconfig/templates/FeatureFlagsImpl.java.template
index 1736af94c5..96de06c3e9 100644
--- a/tools/aconfig/templates/FeatureFlagsImpl.java.template
+++ b/tools/aconfig/templates/FeatureFlagsImpl.java.template
@@ -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
diff --git a/tools/aconfig/templates/Flags.java.template b/tools/aconfig/templates/Flags.java.template
index 95a7f3b0fa..7f047001d2 100644
--- a/tools/aconfig/templates/Flags.java.template
+++ b/tools/aconfig/templates/Flags.java.template
@@ -1,6 +1,5 @@
 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}";