Merge "Remove dangling javadoc" am: 6d61168c0d

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2325337

Change-Id: I01d1573fd6e0e88e1f0513ee30346252386e3321
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

core/java/android/service/autofill/augmented/AugmentedAutofillService.java

@@ -332,7 +332,6 @@ public abstract class AugmentedAutofillService extends Service {
     }
 
     @Override
-    /** @hide */
     protected final void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
         pw.print("Service component: "); pw.println(
                 ComponentName.flattenToShortString(mServiceComponentName));

core/java/android/window/WindowContainerToken.java

@@ -48,7 +48,6 @@ public final class WindowContainerToken implements Parcelable {
     }
 
     @Override
-    /** @hide */
     public void writeToParcel(@NonNull Parcel dest, int flags) {
         dest.writeStrongBinder(mRealToken.asBinder());
     }
@@ -68,7 +67,6 @@ public final class WindowContainerToken implements Parcelable {
             };
 
     @Override
-    /** @hide */
     public int describeContents() {
         return 0;
     }

core/java/android/window/WindowContainerTransaction.java

@@ -865,7 +865,6 @@ public final class WindowContainerTransaction implements Parcelable {
     }
 
     @Override
-    /** @hide */
     public void writeToParcel(@NonNull Parcel dest, int flags) {
         dest.writeMap(mChanges);
         dest.writeTypedList(mHierarchyOps);
@@ -874,7 +873,6 @@ public final class WindowContainerTransaction implements Parcelable {
     }
 
     @Override
-    /** @hide */
     public int describeContents() {
         return 0;
     }

media/java/android/media/AudioPresentation.java

@@ -54,7 +54,11 @@ public final class AudioPresentation {
     private final int mProgramId;
     private final ULocale mLanguage;
 
-    /** @hide */
+    /**
+     * The ContentClassifier int definitions represent the AudioPresentation content
+     * classifier (as per TS 103 190-1 v1.2.1 4.3.3.8.1)
+     * @hide
+     */
     @IntDef(
         value = {
         CONTENT_UNKNOWN,
@@ -67,11 +71,6 @@ public final class AudioPresentation {
         CONTENT_EMERGENCY,
         CONTENT_VOICEOVER,
     })
-
-    /**
-     * The ContentClassifier int definitions represent the AudioPresentation content
-     * classifier (as per TS 103 190-1 v1.2.1 4.3.3.8.1)
-    */
     @Retention(RetentionPolicy.SOURCE)
     public @interface ContentClassifier {}
 

telephony/java/android/service/euicc/EuiccProfileInfo.java

@@ -49,7 +49,6 @@ public final class EuiccProfileInfo implements Parcelable {
             POLICY_RULE_DO_NOT_DELETE,
             POLICY_RULE_DELETE_AFTER_DISABLING
     })
-    /** @hide */
     public @interface PolicyRule {}
     /** Once this profile is enabled, it cannot be disabled. */
     public static final int POLICY_RULE_DO_NOT_DISABLE = 1;
@@ -66,7 +65,6 @@ public final class EuiccProfileInfo implements Parcelable {
             PROFILE_CLASS_OPERATIONAL,
             PROFILE_CLASS_UNSET
     })
-    /** @hide */
     public @interface ProfileClass {}
     /** Testing profiles */
     public static final int PROFILE_CLASS_TESTING = 0;
@@ -87,7 +85,6 @@ public final class EuiccProfileInfo implements Parcelable {
             PROFILE_STATE_ENABLED,
             PROFILE_STATE_UNSET
     })
-    /** @hide */
     public @interface ProfileState {}
     /** Disabled profiles */
     public static final int PROFILE_STATE_DISABLED = 0;

telephony/java/android/telephony/euicc/EuiccCardManager.java

@@ -75,7 +75,6 @@ public class EuiccCardManager {
             CANCEL_REASON_TIMEOUT,
             CANCEL_REASON_PPR_NOT_ALLOWED
     })
-    /** @hide */
     public @interface CancelReason {
     }
 
@@ -105,7 +104,6 @@ public class EuiccCardManager {
             RESET_OPTION_DELETE_FIELD_LOADED_TEST_PROFILES,
             RESET_OPTION_RESET_DEFAULT_SMDP_ADDRESS
     })
-    /** @hide */
     public @interface ResetOption {
     }
 

telephony/java/android/telephony/euicc/EuiccNotification.java

@@ -44,7 +44,6 @@ public final class EuiccNotification implements Parcelable {
             EVENT_DISABLE,
             EVENT_DELETE
     })
-    /** @hide */
     public @interface Event {}
 
     /** A profile is downloaded and installed. */

telephony/java/android/telephony/euicc/EuiccRulesAuthTable.java

@@ -42,7 +42,6 @@ public final class EuiccRulesAuthTable implements Parcelable {
     @IntDef(flag = true, prefix = { "POLICY_RULE_FLAG_" }, value = {
             POLICY_RULE_FLAG_CONSENT_REQUIRED
     })
-    /** @hide */
     public @interface PolicyRuleFlag {}
 
     /** User consent is required to install the profile. */