Merge "Remove dangling javadoc" (3b1489ea) · Commits · e / os / android_frameworks_base

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

+0 −1

Original line number	Diff line number	Diff line
		@@ -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));

+0 −2

Original line number	Diff line number	Diff line
		@@ -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;
		}

+0 −2

Original line number	Diff line number	Diff line
		@@ -925,7 +925,6 @@ public final class WindowContainerTransaction implements Parcelable {
		}

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

		@Override
		/** @hide */
		public int describeContents() {
		return 0;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

+5 −6

Original line number	Diff line number	Diff line
		@@ -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 {}