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

Commit 975ca816 authored by Andrew Sapperstein's avatar Andrew Sapperstein Committed by Android (Google) Code Review
Browse files

Merge changes from topic "cherrypick-ctor-refs-03y8i58ine" into rvc-dev 

* changes:
  Update inner class constructor refs to use proper syntax.
  Fix broken @see tags in public documentation.
parents abe5a4f3 88d565e7

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

+8 −8
Original line number Diff line number Diff line
@@ -307,8 +307,8 @@ public class BlobStoreManager { 
     *                                {@link #getRemainingLeaseQuotaBytes()} before trying to

     *                                acquire a lease.

     *

     * @see {@link #acquireLease(BlobHandle, int)}

     * @see {@link #acquireLease(BlobHandle, CharSequence)}

     * @see #acquireLease(BlobHandle, int)

     * @see #acquireLease(BlobHandle, CharSequence)

     */

    public void acquireLease(@NonNull BlobHandle blobHandle, @IdRes int descriptionResId,

            @CurrentTimeMillisLong long leaseExpiryTimeMillis) throws IOException {
@@ -367,8 +367,8 @@ public class BlobStoreManager { 
     *                                {@link #getRemainingLeaseQuotaBytes()} before trying to

     *                                acquire a lease.

     *

     * @see {@link #acquireLease(BlobHandle, int, long)}

     * @see {@link #acquireLease(BlobHandle, CharSequence)}

     * @see #acquireLease(BlobHandle, int, long)

     * @see #acquireLease(BlobHandle, CharSequence)

     */

    public void acquireLease(@NonNull BlobHandle blobHandle, @NonNull CharSequence description,

            @CurrentTimeMillisLong long leaseExpiryTimeMillis) throws IOException {
@@ -420,8 +420,8 @@ public class BlobStoreManager { 
     *                                {@link #getRemainingLeaseQuotaBytes()} before trying to

     *                                acquire a lease.

     *

     * @see {@link #acquireLease(BlobHandle, int, long)}

     * @see {@link #acquireLease(BlobHandle, CharSequence, long)}

     * @see #acquireLease(BlobHandle, int, long)

     * @see #acquireLease(BlobHandle, CharSequence, long)

     */

    public void acquireLease(@NonNull BlobHandle blobHandle, @IdRes int descriptionResId)

            throws IOException {
@@ -467,8 +467,8 @@ public class BlobStoreManager { 
     *                                {@link #getRemainingLeaseQuotaBytes()} before trying to

     *                                acquire a lease.

     *

     * @see {@link #acquireLease(BlobHandle, int)}

     * @see {@link #acquireLease(BlobHandle, CharSequence, long)}

     * @see #acquireLease(BlobHandle, int)

     * @see #acquireLease(BlobHandle, CharSequence, long)

     */

    public void acquireLease(@NonNull BlobHandle blobHandle, @NonNull CharSequence description)

            throws IOException {

apex/jobscheduler/framework/java/android/app/job/JobScheduler.java

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ import java.util.List; 
 * system will execute this job on your application's {@link android.app.job.JobService}.

 * You identify the service component that implements the logic for your job when you

 * construct the JobInfo using

 * {@link android.app.job.JobInfo.Builder#JobInfo.Builder(int,android.content.ComponentName)}.

 * {@link android.app.job.JobInfo.Builder#Builder(int,android.content.ComponentName)}.

 * </p>

 * <p>

 * The framework will be intelligent about when it executes jobs, and attempt to batch
@@ -153,7 +153,7 @@ public abstract class JobScheduler { 
     * method is ignored.

     *

     * @param jobId unique identifier for the job to be canceled, as supplied to

     *     {@link JobInfo.Builder#JobInfo.Builder(int, android.content.ComponentName)

     *     {@link JobInfo.Builder#Builder(int, android.content.ComponentName)

     *     JobInfo.Builder(int, android.content.ComponentName)}.

     */

    public abstract void cancel(int jobId);

core/java/android/app/Activity.java

+0 −1
Original line number 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

     * event stream.

     *

     * @see KeyEvent.Callback#onKeyLongPress()

     * @see KeyEvent.Callback#onKeyLongPress(int, KeyEvent)

     */

    public boolean onKeyLongPress(int keyCode, KeyEvent event) {

core/java/android/app/ActivityManager.java

+1 −2
Original line number Diff line number Diff line
@@ -2450,8 +2450,7 @@ public class ActivityManager { 
     * has access to it.

     *

     * @see ActivityOptions#setLaunchDisplayId(int)

     * @see android.view.Display.FLAG_PRIVATE

     * @see android.view.Display.TYPE_VIRTUAL

     * @see android.view.Display#FLAG_PRIVATE

     *

     * @param context Source context, from which an activity will be started.

     * @param displayId Target display id.

core/java/android/app/AppOpsManager.java

+0 −6
Original line number Diff line number Diff line
@@ -6858,10 +6858,7 @@ public class AppOpsManager { 
     * @param ops The operations to watch.

     * @param callback Where to report changes.

     *

     * @see #isOperationActive

     * @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

    // @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

     * non-registered callback has no effect.

     *

     * @see #isOperationActive

     * @see #startWatchingActive

     * @see #startOp(int, int, String, boolean, String, String)

     * @see #finishOp(int, int, String, String)

     */

    public void stopWatchingActive(@NonNull OnOpActiveChangedListener callback) {

        synchronized (mActiveWatchers) {