From b704a2809b90f4c6433db8b0468d43bc95da10d0 Mon Sep 17 00:00:00 2001 From: Adrian Roos Date: Fri, 2 Dec 2022 16:25:44 +0000 Subject: [PATCH] Remove dangling javadoc Removes javadoc that appears in places where it is not considered as such by javac / metalava. Test: compiles Change-Id: I701d7dfe17db67e4735e0ded4ff1c3e0ddb3bfa2 --- .../autofill/augmented/AugmentedAutofillService.java | 1 - core/java/android/window/WindowContainerToken.java | 2 -- .../android/window/WindowContainerTransaction.java | 2 -- graphics/java/android/graphics/ImageFormat.java | 2 +- media/java/android/media/AudioPresentation.java | 11 +++++------ .../java/android/service/euicc/EuiccProfileInfo.java | 3 --- .../android/telephony/euicc/EuiccCardManager.java | 2 -- .../android/telephony/euicc/EuiccNotification.java | 1 - .../android/telephony/euicc/EuiccRulesAuthTable.java | 1 - 9 files changed, 6 insertions(+), 19 deletions(-) diff --git a/core/java/android/service/autofill/augmented/AugmentedAutofillService.java b/core/java/android/service/autofill/augmented/AugmentedAutofillService.java index d9a310f7a6a3f..745f36db15e8e 100644 --- a/core/java/android/service/autofill/augmented/AugmentedAutofillService.java +++ b/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)); diff --git a/core/java/android/window/WindowContainerToken.java b/core/java/android/window/WindowContainerToken.java index 22b90b260f052..b914cb0dfd758 100644 --- a/core/java/android/window/WindowContainerToken.java +++ b/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; } diff --git a/core/java/android/window/WindowContainerTransaction.java b/core/java/android/window/WindowContainerTransaction.java index 1063532af44f9..223e338f4ab20 100644 --- a/core/java/android/window/WindowContainerTransaction.java +++ b/core/java/android/window/WindowContainerTransaction.java @@ -905,7 +905,6 @@ public final class WindowContainerTransaction implements Parcelable { } @Override - /** @hide */ public void writeToParcel(@NonNull Parcel dest, int flags) { dest.writeMap(mChanges); dest.writeTypedList(mHierarchyOps); @@ -914,7 +913,6 @@ public final class WindowContainerTransaction implements Parcelable { } @Override - /** @hide */ public int describeContents() { return 0; } diff --git a/graphics/java/android/graphics/ImageFormat.java b/graphics/java/android/graphics/ImageFormat.java index c93b733a3f63e..68f29278f2823 100644 --- a/graphics/java/android/graphics/ImageFormat.java +++ b/graphics/java/android/graphics/ImageFormat.java @@ -26,7 +26,7 @@ public class ImageFormat { @Retention(RetentionPolicy.SOURCE) @IntDef(value = { UNKNOWN, - /** + /* * Since some APIs accept either ImageFormat or PixelFormat (and the two * enums do not overlap since they're both partial versions of the * internal format enum), add PixelFormat values here so linting diff --git a/media/java/android/media/AudioPresentation.java b/media/java/android/media/AudioPresentation.java index 47358be3e9261..05f3c5a3512b7 100644 --- a/media/java/android/media/AudioPresentation.java +++ b/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 {} diff --git a/telephony/java/android/service/euicc/EuiccProfileInfo.java b/telephony/java/android/service/euicc/EuiccProfileInfo.java index 8ec500b4d49d9..7eccd1a4482f1 100644 --- a/telephony/java/android/service/euicc/EuiccProfileInfo.java +++ b/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; diff --git a/telephony/java/android/telephony/euicc/EuiccCardManager.java b/telephony/java/android/telephony/euicc/EuiccCardManager.java index e61d1e6842a70..b18eaa5334c6e 100644 --- a/telephony/java/android/telephony/euicc/EuiccCardManager.java +++ b/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 { } diff --git a/telephony/java/android/telephony/euicc/EuiccNotification.java b/telephony/java/android/telephony/euicc/EuiccNotification.java index c348cff250523..be0048f73bf48 100644 --- a/telephony/java/android/telephony/euicc/EuiccNotification.java +++ b/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. */ diff --git a/telephony/java/android/telephony/euicc/EuiccRulesAuthTable.java b/telephony/java/android/telephony/euicc/EuiccRulesAuthTable.java index d5a05ae2dbb84..1c6b6b6e83fc7 100644 --- a/telephony/java/android/telephony/euicc/EuiccRulesAuthTable.java +++ b/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. */