Merge changes from topic "ctor-refs" am: 1ac3746aa8 (d14004d5) · Commits · e / os / android_frameworks_base

core/java/android/app/Instrumentation.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -729,7 +729,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.

+3 −3

Original line number	Diff line number	Diff line
		@@ -3437,7 +3437,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
		@@ -7071,7 +7071,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
		*
		@@ -7091,7 +7091,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
		*/

+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

+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) {

+2 −2

Original line number	Diff line number	Diff line
		@@ -628,7 +628,7 @@ public final class SaveInfo implements Parcelable {
		*
		* <p>The sanitizer can also be used as an alternative for a
		* {@link #setValidator(Validator) validator}. If any of the {@code ids} is a
		* {@link #SaveInfo.Builder(int, AutofillId[]) required id} and the {@code sanitizer} fails
		* {@link #Builder(int, AutofillId[]) required id} and the {@code sanitizer} fails
		* because of it, then the save UI is not shown.
		*
		* @param sanitizer an implementation provided by the Android System.
		@@ -686,7 +686,7 @@ public final class SaveInfo implements Parcelable {
		* Builds a new {@link SaveInfo} instance.
		*
		* @throws IllegalStateException if no
		* {@link #SaveInfo.Builder(int, AutofillId[]) required ids},
		* {@link #Builder(int, AutofillId[]) required ids},
		* or {@link #setOptionalIds(AutofillId[]) optional ids}, or {@link #FLAG_DELAY_SAVE}
		* were set
		*/