Merge "Fix broken links in @see tags in framework docs." (62786b44) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -3893,7 +3893,6 @@ public class Notification implements Parcelable
		*

		* @see Notification#FLAG_ONGOING_EVENT
		* @see Service#setForeground(boolean)
		*/
		public Builder setOngoing(boolean ongoing) {
		setFlag(FLAG_ONGOING_EVENT, ongoing);
		@@ -3912,7 +3911,7 @@ public class Notification implements Parcelable
		* However, for {@link MediaStyle} and {@link DecoratedMediaCustomViewStyle} notifications
		* that have a media session attached there is no such requirement.
		*
		* @see Builder#setColor(int)
		* @see #setColor(int)
		* @see MediaStyle#setMediaSession(MediaSession.Token)
		*/
		public Builder setColorized(boolean colorize) {

core/java/android/app/backup/BackupAgent.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -334,7 +334,6 @@ public abstract class BackupAgent extends ContextWrapper {
		* @throws IOException
		*
		* @see Context#getNoBackupFilesDir()
		* @see ApplicationInfo#fullBackupContent
		* @see #fullBackupFile(File, FullBackupDataOutput)
		* @see #onRestoreFile(ParcelFileDescriptor, long, File, int, long, long)
		*/

core/java/android/app/slice/Slice.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -425,7 +425,7 @@ public final class Slice implements Parcelable {
		/**
		* Add a sub-slice to the slice being constructed
		* @param subType Optional template-specific type information
		* @see {@link SliceItem#getSubType()}
		* @see SliceItem#getSubType()
		*/
		public Builder addSubSlice(@NonNull Slice slice, @Nullable @SliceSubtype String subType) {
		Preconditions.checkNotNull(slice);
		@@ -437,7 +437,7 @@ public final class Slice implements Parcelable {
		/**
		* Add an action to the slice being constructed
		* @param subType Optional template-specific type information
		* @see {@link SliceItem#getSubType()}
		* @see SliceItem#getSubType()
		*/
		public Slice.Builder addAction(@NonNull PendingIntent action, @NonNull Slice s,
		@Nullable @SliceSubtype String subType) {
		@@ -453,7 +453,7 @@ public final class Slice implements Parcelable {
		/**
		* Add text to the slice being constructed
		* @param subType Optional template-specific type information
		* @see {@link SliceItem#getSubType()}
		* @see SliceItem#getSubType()
		*/
		public Builder addText(CharSequence text, @Nullable @SliceSubtype String subType,
		@SliceHint List<String> hints) {
		@@ -464,7 +464,7 @@ public final class Slice implements Parcelable {
		/**
		* Add an image to the slice being constructed
		* @param subType Optional template-specific type information
		* @see {@link SliceItem#getSubType()}
		* @see SliceItem#getSubType()
		*/
		public Builder addIcon(Icon icon, @Nullable @SliceSubtype String subType,
		@SliceHint List<String> hints) {
		@@ -476,7 +476,7 @@ public final class Slice implements Parcelable {
		/**
		* Add remote input to the slice being constructed
		* @param subType Optional template-specific type information
		* @see {@link SliceItem#getSubType()}
		* @see SliceItem#getSubType()
		*/
		public Slice.Builder addRemoteInput(RemoteInput remoteInput,
		@Nullable @SliceSubtype String subType,
		@@ -490,7 +490,7 @@ public final class Slice implements Parcelable {
		/**
		* Add an integer to the slice being constructed
		* @param subType Optional template-specific type information
		* @see {@link SliceItem#getSubType()}
		* @see SliceItem#getSubType()
		*/
		public Builder addInt(int value, @Nullable @SliceSubtype String subType,
		@SliceHint List<String> hints) {
		@@ -511,7 +511,7 @@ public final class Slice implements Parcelable {
		/**
		* Add a long to the slice being constructed
		* @param subType Optional template-specific type information
		* @see {@link SliceItem#getSubType()}
		* @see SliceItem#getSubType()
		*/
		public Slice.Builder addLong(long value, @Nullable @SliceSubtype String subType,
		@SliceHint List<String> hints) {
		@@ -525,7 +525,7 @@ public final class Slice implements Parcelable {
		* <p>Expected to be used for support library extension, should not be used for general
		* development
		* @param subType Optional template-specific type information
		* @see {@link SliceItem#getSubType()}
		* @see SliceItem#getSubType()
		*/
		public Slice.Builder addBundle(Bundle bundle, @Nullable @SliceSubtype String subType,
		@SliceHint List<String> hints) {

core/java/android/app/slice/SliceProvider.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -209,8 +209,8 @@ public abstract class SliceProvider extends ContentProvider {
		*
		* @param sliceUri Uri to bind.
		* @param supportedSpecs List of supported specs.
		* @see {@link Slice}.
		* @see {@link Slice#HINT_PARTIAL}
		* @see Slice.
		* @see Slice#HINT_PARTIAL
		*/
		public Slice onBindSlice(Uri sliceUri, Set<SliceSpec> supportedSpecs) {
		return onBindSlice(sliceUri, new ArrayList<>(supportedSpecs));

core/java/android/app/slice/SliceSpec.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -36,7 +36,7 @@ import android.os.Parcelable;
		* {@link #canRender}.
		*
		* @see Slice
		* @see SliceProvider#onBindSlice(Uri)
		* @see SliceProvider#onBindSlice(Uri, Set)
		*/
		public final class SliceSpec implements Parcelable {