Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7f6641b8 authored Jun 04, 2018 by Aurimas Liutikas Committed by Android (Google) Code Review Jun 04, 2018

Merge "Fix broken links in @see tags in framework docs."

parents 232e5580 e701dc17

core/java/android/app/Notification.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -6756,7 +6756,7 @@ public class Notification implements Parcelable
		* Should be unique amongst all individuals in the conversation, and should be
		* consistent during re-posts of the notification.
		*
		* @see Message#Message(CharSequence, long, CharSequence)
		* @see Message#Notification.MessagingStyle.Message(CharSequence, long, CharSequence)
		*
		* @return this object for method chaining
		*
		@@ -6776,7 +6776,7 @@ public class Notification implements Parcelable
		* Should be <code>null</code> for messages by the current user, in which case
		* the platform will insert the user set in {@code MessagingStyle(Person)}.
		*
		* @see Message#Message(CharSequence, long, CharSequence)
		* @see Message#Notification.MessagingStyle.Message(CharSequence, long, CharSequence)
		*
		* @return this object for method chaining
		*/

core/java/android/content/pm/PackageInstaller.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -1236,8 +1236,6 @@ public class PackageInstaller {
		/**
		* Sets the UID that initiated the package installation. This is informational
		* and may be used as a signal for anti-malware purposes.
		*
		* @see Intent#EXTRA_ORIGINATING_UID
		*/
		public void setOriginatingUid(int originatingUid) {
		this.originatingUid = originatingUid;

core/java/android/nfc/tech/MifareClassic.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -318,7 +318,7 @@ public final class MifareClassic extends BasicTagTechnology {
		* <p>Successful authentication of a sector with key A enables other
		* I/O operations on that sector. The set of operations granted by key A
		* key depends on the ACL bits set in that sector. For more information
		* see the MIFARE Classic specification on {@see http://www.nxp.com}.
		* see the MIFARE Classic specification on <a href="http://www.nxp.com">http://www.nxp.com</a>.
		*
		* <p>A failed authentication attempt causes an implicit reconnection to the
		* tag, so authentication to other sectors will be lost.
		@@ -345,7 +345,7 @@ public final class MifareClassic extends BasicTagTechnology {
		* <p>Successful authentication of a sector with key B enables other
		* I/O operations on that sector. The set of operations granted by key B
		* depends on the ACL bits set in that sector. For more information
		* see the MIFARE Classic specification on {@see http://www.nxp.com}.
		* see the MIFARE Classic specification on <a href="http://www.nxp.com">http://www.nxp.com</a>.
		*
		* <p>A failed authentication attempt causes an implicit reconnection to the
		* tag, so authentication to other sectors will be lost.

core/java/android/provider/DocumentsContract.java

+1 −3

Original line number	Diff line number	Diff line
		@@ -157,8 +157,6 @@ public final class DocumentsContract {
		* <li>When supplying information in {@link DocumentsProvider#queryChildDocuments}, include
		* {@link Document#FLAG_SUPPORTS_SETTINGS} in the flags for each document that supports
		* settings.
		*
		* @see DocumentsContact#Document#FLAG_SUPPORTS_SETTINGS
		*/
		public static final String
		ACTION_DOCUMENT_SETTINGS = "android.provider.action.DOCUMENT_SETTINGS";
		@@ -434,7 +432,7 @@ public final class DocumentsContract {
		* Flag indicating that a Web link can be obtained for the document.
		*
		* @see #COLUMN_FLAGS
		* @see DocumentsContract#createWebLinkIntent(PackageManager, Uri, Bundle)
		* @see DocumentsProvider#createWebLinkIntent(String, Bundle)
		*/
		public static final int FLAG_WEB_LINKABLE = 1 << 12;

core/java/android/provider/MediaStore.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -203,7 +203,7 @@ public final class MediaStore {
		/**
		* The name of the Intent-extra used to control the orientation of a ViewImage or a MovieView.
		* This is an int property that overrides the activity's requestedOrientation.
		* @see android.content.pm.ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
		* @see android.content.pm.ActivityInfo#SCREEN_ORIENTATION_UNSPECIFIED
		*/
		public static final String EXTRA_SCREEN_ORIENTATION = "android.intent.extra.screenOrientation";