Fix broken @see tags in public documentation. am: 8fe35e5f21 am: 1ba3a59941 am: e6790083a4 (af738889) · Commits · e / os / android_frameworks_base

apex/blobstore/framework/java/android/app/blob/BlobStoreManager.java

+8 −8

Original line number	Original line	Diff line number	Diff line
	@@ -307,8 +307,8 @@ public class BlobStoreManager {
	* {@link #getRemainingLeaseQuotaBytes()} before trying to		* {@link #getRemainingLeaseQuotaBytes()} before trying to
	* acquire a lease.		* acquire a lease.
	*		*
	* @see {@link #acquireLease(BlobHandle, int)}		* @see #acquireLease(BlobHandle, int)
	* @see {@link #acquireLease(BlobHandle, CharSequence)}		* @see #acquireLease(BlobHandle, CharSequence)
	*/		*/
	public void acquireLease(@NonNull BlobHandle blobHandle, @IdRes int descriptionResId,		public void acquireLease(@NonNull BlobHandle blobHandle, @IdRes int descriptionResId,
	@CurrentTimeMillisLong long leaseExpiryTimeMillis) throws IOException {		@CurrentTimeMillisLong long leaseExpiryTimeMillis) throws IOException {
	@@ -367,8 +367,8 @@ public class BlobStoreManager {
	* {@link #getRemainingLeaseQuotaBytes()} before trying to		* {@link #getRemainingLeaseQuotaBytes()} before trying to
	* acquire a lease.		* acquire a lease.
	*		*
	* @see {@link #acquireLease(BlobHandle, int, long)}		* @see #acquireLease(BlobHandle, int, long)
	* @see {@link #acquireLease(BlobHandle, CharSequence)}		* @see #acquireLease(BlobHandle, CharSequence)
	*/		*/
	public void acquireLease(@NonNull BlobHandle blobHandle, @NonNull CharSequence description,		public void acquireLease(@NonNull BlobHandle blobHandle, @NonNull CharSequence description,
	@CurrentTimeMillisLong long leaseExpiryTimeMillis) throws IOException {		@CurrentTimeMillisLong long leaseExpiryTimeMillis) throws IOException {
	@@ -420,8 +420,8 @@ public class BlobStoreManager {
	* {@link #getRemainingLeaseQuotaBytes()} before trying to		* {@link #getRemainingLeaseQuotaBytes()} before trying to
	* acquire a lease.		* acquire a lease.
	*		*
	* @see {@link #acquireLease(BlobHandle, int, long)}		* @see #acquireLease(BlobHandle, int, long)
	* @see {@link #acquireLease(BlobHandle, CharSequence, long)}		* @see #acquireLease(BlobHandle, CharSequence, long)
	*/		*/
	public void acquireLease(@NonNull BlobHandle blobHandle, @IdRes int descriptionResId)		public void acquireLease(@NonNull BlobHandle blobHandle, @IdRes int descriptionResId)
	throws IOException {		throws IOException {
	@@ -467,8 +467,8 @@ public class BlobStoreManager {
	* {@link #getRemainingLeaseQuotaBytes()} before trying to		* {@link #getRemainingLeaseQuotaBytes()} before trying to
	* acquire a lease.		* acquire a lease.
	*		*
	* @see {@link #acquireLease(BlobHandle, int)}		* @see #acquireLease(BlobHandle, int)
	* @see {@link #acquireLease(BlobHandle, CharSequence, long)}		* @see #acquireLease(BlobHandle, CharSequence, long)
	*/		*/
	public void acquireLease(@NonNull BlobHandle blobHandle, @NonNull CharSequence description)		public void acquireLease(@NonNull BlobHandle blobHandle, @NonNull CharSequence description)
	throws IOException {		throws IOException {

core/java/android/app/Activity.java

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3743,7 +3743,6 @@ public class Activity extends ContextThemeWrapper
	* To receive this callback, you must return true from onKeyDown for the current		* To receive this callback, you must return true from onKeyDown for the current
	* event stream.		* event stream.
	*		*
	* @see KeyEvent.Callback#onKeyLongPress()
	* @see KeyEvent.Callback#onKeyLongPress(int, KeyEvent)		* @see KeyEvent.Callback#onKeyLongPress(int, KeyEvent)
	*/		*/
	public boolean onKeyLongPress(int keyCode, KeyEvent event) {		public boolean onKeyLongPress(int keyCode, KeyEvent event) {

core/java/android/app/ActivityManager.java

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -2450,8 +2450,7 @@ public class ActivityManager {
	* has access to it.		* has access to it.
	*		*
	* @see ActivityOptions#setLaunchDisplayId(int)		* @see ActivityOptions#setLaunchDisplayId(int)
	* @see android.view.Display.FLAG_PRIVATE		* @see android.view.Display#FLAG_PRIVATE
	* @see android.view.Display.TYPE_VIRTUAL
	*		*
	* @param context Source context, from which an activity will be started.		* @param context Source context, from which an activity will be started.
	* @param displayId Target display id.		* @param displayId Target display id.

core/java/android/app/AppOpsManager.java

+0 −6

Original line number	Original line	Diff line number	Diff line
	@@ -6858,10 +6858,7 @@ public class AppOpsManager {
	* @param ops The operations to watch.		* @param ops The operations to watch.
	* @param callback Where to report changes.		* @param callback Where to report changes.
	*		*
	* @see #isOperationActive
	* @see #stopWatchingActive		* @see #stopWatchingActive
	* @see #startOp(int, int, String, boolean, String, String)
	* @see #finishOp(int, int, String, String)
	*/		*/
	// TODO: Uncomment below annotation once b/73559440 is fixed		// TODO: Uncomment below annotation once b/73559440 is fixed
	// @RequiresPermission(value=Manifest.permission.WATCH_APPOPS, conditional=true)		// @RequiresPermission(value=Manifest.permission.WATCH_APPOPS, conditional=true)
	@@ -6909,10 +6906,7 @@ public class AppOpsManager {
	* long running and it has a clear start and stop delimiters. Unregistering a		* long running and it has a clear start and stop delimiters. Unregistering a
	* non-registered callback has no effect.		* non-registered callback has no effect.
	*		*
	* @see #isOperationActive
	* @see #startWatchingActive		* @see #startWatchingActive
	* @see #startOp(int, int, String, boolean, String, String)
	* @see #finishOp(int, int, String, String)
	*/		*/
	public void stopWatchingActive(@NonNull OnOpActiveChangedListener callback) {		public void stopWatchingActive(@NonNull OnOpActiveChangedListener callback) {
	synchronized (mActiveWatchers) {		synchronized (mActiveWatchers) {

core/java/android/app/Notification.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -3631,7 +3631,7 @@ public class Notification implements Parcelable
	* @param shortcutId the {@link ShortcutInfo#getId() id} of the shortcut this notification		* @param shortcutId the {@link ShortcutInfo#getId() id} of the shortcut this notification
	* is linked to		* is linked to
	*		*
	* @see Notification.BubbleMetadata.Builder#Builder(String)		* @see Notification.BubbleMetadata.Builder#Notification.BubbleMetadata.Builder(String)
	*/		*/
	@NonNull		@NonNull
	public Builder setShortcutId(String shortcutId) {		public Builder setShortcutId(String shortcutId) {
	@@ -5993,7 +5993,7 @@ public class Notification implements Parcelable
	* metadata matches the shortcutId set on the notification builder, if one was set.		* metadata matches the shortcutId set on the notification builder, if one was set.
	* If the shortcutId's were specified but do not match, an exception is thrown here.		* If the shortcutId's were specified but do not match, an exception is thrown here.
	*		*
	* @see Notification.BubbleMetadata.Builder#Builder(String)		* @see Notification.BubbleMetadata.Builder#Notification.BubbleMetadata.Builder(String)
	* @see #setShortcutId(String)		* @see #setShortcutId(String)
	*/		*/
	@NonNull		@NonNull