Merge "Make deprecated AppTarget APIs visible" into qt-dev (de005d26) · Commits · e / os / android_frameworks_base

api/system-current.txt

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1092,11 +1092,14 @@ package android.app.prediction {
	}		}

	public static final class AppTarget.Builder {		public static final class AppTarget.Builder {
			ctor @Deprecated public AppTarget.Builder(@NonNull android.app.prediction.AppTargetId);
	ctor public AppTarget.Builder(@NonNull android.app.prediction.AppTargetId, @NonNull String, @NonNull android.os.UserHandle);		ctor public AppTarget.Builder(@NonNull android.app.prediction.AppTargetId, @NonNull String, @NonNull android.os.UserHandle);
	ctor public AppTarget.Builder(@NonNull android.app.prediction.AppTargetId, @NonNull android.content.pm.ShortcutInfo);		ctor public AppTarget.Builder(@NonNull android.app.prediction.AppTargetId, @NonNull android.content.pm.ShortcutInfo);
	method @NonNull public android.app.prediction.AppTarget build();		method @NonNull public android.app.prediction.AppTarget build();
	method @NonNull public android.app.prediction.AppTarget.Builder setClassName(@NonNull String);		method @NonNull public android.app.prediction.AppTarget.Builder setClassName(@NonNull String);
	method @NonNull public android.app.prediction.AppTarget.Builder setRank(@IntRange(from=0) int);		method @NonNull public android.app.prediction.AppTarget.Builder setRank(@IntRange(from=0) int);
			method @Deprecated @NonNull public android.app.prediction.AppTarget.Builder setTarget(@NonNull String, @NonNull android.os.UserHandle);
			method @Deprecated @NonNull public android.app.prediction.AppTarget.Builder setTarget(@NonNull android.content.pm.ShortcutInfo);
	}		}

	public final class AppTargetEvent implements android.os.Parcelable {		public final class AppTargetEvent implements android.os.Parcelable {

api/test-current.txt

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -503,6 +503,8 @@ package android.app.prediction {
	method @NonNull public android.app.prediction.AppTarget build();		method @NonNull public android.app.prediction.AppTarget build();
	method @NonNull public android.app.prediction.AppTarget.Builder setClassName(@NonNull String);		method @NonNull public android.app.prediction.AppTarget.Builder setClassName(@NonNull String);
	method @NonNull public android.app.prediction.AppTarget.Builder setRank(@IntRange(from=0) int);		method @NonNull public android.app.prediction.AppTarget.Builder setRank(@IntRange(from=0) int);
			method @Deprecated @NonNull public android.app.prediction.AppTarget.Builder setTarget(@NonNull String, @NonNull android.os.UserHandle);
			method @Deprecated @NonNull public android.app.prediction.AppTarget.Builder setTarget(@NonNull android.content.pm.ShortcutInfo);
	}		}

	public final class AppTargetEvent implements android.os.Parcelable {		public final class AppTargetEvent implements android.os.Parcelable {

core/java/android/app/prediction/AppTarget.java

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -208,6 +208,7 @@ public final class AppTarget implements Parcelable {
	* @hide		* @hide
	*/		*/
	@Deprecated		@Deprecated
			@SystemApi
	public Builder(@NonNull AppTargetId id) {		public Builder(@NonNull AppTargetId id) {
	mId = id;		mId = id;
	}		}
	@@ -243,7 +244,6 @@ public final class AppTarget implements Parcelable {

	/**		/**
	* @deprecated Use the appropriate constructor.		* @deprecated Use the appropriate constructor.
	* @hide
	*/		*/
	@NonNull		@NonNull
	@Deprecated		@Deprecated
	@@ -258,7 +258,6 @@ public final class AppTarget implements Parcelable {

	/**		/**
	* @deprecated Use the appropriate constructor.		* @deprecated Use the appropriate constructor.
	* @hide
	*/		*/
	@NonNull		@NonNull
	@Deprecated		@Deprecated