Merge changes from topic "cherrypick-ctor-refs-03y8i58ine" into rvc-dev am: 975ca816ec (6fd486ee) · Commits · e / os / android_frameworks_base

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/Instrumentation.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -732,7 +732,7 @@ public class Instrumentation {
		* a non-null value if the intent needs to be intercepted.
		*
		* <p> Whenever a new activity is started, this method will be called on instances created
		* using {@link #Instrumentation.ActivityMonitor()} to check if there is a match. In case
		* using {@link #ActivityMonitor()} to check if there is a match. In case
		* of a match, the activity start will be blocked and the returned result will be used.
		*
		* @param intent The intent used for starting the activity.

core/java/android/app/Notification.java

+5 −5

Original line number	Diff line number	Diff line
		@@ -3513,7 +3513,7 @@ public class Notification implements Parcelable
		}

		/**
		* @deprecated use {@link Notification.Builder#Notification.Builder(Context, String)}
		* @deprecated use {@link #Builder(Context, String)}
		* instead. All posted Notifications must specify a NotificationChannel Id.
		*/
		@Deprecated
		@@ -3631,7 +3631,7 @@ public class Notification implements Parcelable
		* @param shortcutId the {@link ShortcutInfo#getId() id} of the shortcut this notification
		* is linked to
		*
		* @see Notification.BubbleMetadata.Builder#Notification.BubbleMetadata.Builder(String)
		* @see BubbleMetadata.Builder#Builder(String)
		*/
		@NonNull
		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.
		* If the shortcutId's were specified but do not match, an exception is thrown here.
		*
		* @see Notification.BubbleMetadata.Builder#Notification.BubbleMetadata.Builder(String)
		* @see BubbleMetadata.Builder#Builder(String)
		* @see #setShortcutId(String)
		*/
		@NonNull
		@@ -7297,7 +7297,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#Notification.MessagingStyle.Message(CharSequence, long, CharSequence)
		* @see Message#Message(CharSequence, long, CharSequence)
		*
		* @return this object for method chaining
		*
		@@ -7317,7 +7317,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#Notification.MessagingStyle.Message(CharSequence, long, CharSequence)
		* @see Message#Message(CharSequence, long, CharSequence)
		*
		* @return this object for method chaining
		*/

core/java/android/service/autofill/CustomDescription.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -262,7 +262,7 @@ public final class CustomDescription implements Parcelable {
		*
		* @param condition condition used to trigger the updates.
		* @param updates actions to be applied to the
		* {@link #CustomDescription.Builder(RemoteViews) template presentation} when the condition
		* {@link #Builder(RemoteViews) template presentation} when the condition
		* is satisfied.
		*
		* @return this builder

core/java/android/service/autofill/ImageTransformation.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -123,7 +123,7 @@ public final class ImageTransformation extends InternalTransformation implements
		* {@link RemoteViews presentation} must contain a {@link ImageView} child with that id.
		*
		* @deprecated use
		* {@link #ImageTransformation.Builder(AutofillId, Pattern, int, CharSequence)} instead.
		* {@link #Builder(AutofillId, Pattern, int, CharSequence)} instead.
		*/
		@Deprecated
		public Builder(@NonNull AutofillId id, @NonNull Pattern regex, @DrawableRes int resId) {