Merge "Ensure some calls are available for testing" (26447bc8) · Commits · e / os / android_frameworks_base

api/system-current.txt

+4 −0

Original line number	Diff line number	Diff line
		@@ -990,6 +990,7 @@ package android.app.prediction {
		}

		public static final class AppPredictionContext.Builder {
		ctor public AppPredictionContext.Builder(@NonNull android.content.Context);
		method public android.app.prediction.AppPredictionContext build();
		method public android.app.prediction.AppPredictionContext.Builder setExtras(@Nullable android.os.Bundle);
		method public android.app.prediction.AppPredictionContext.Builder setPredictedTargetCount(int);
		@@ -1021,6 +1022,8 @@ package android.app.prediction {
		}

		public final class AppTarget implements android.os.Parcelable {
		ctor public AppTarget(@NonNull android.app.prediction.AppTargetId, @NonNull String, @Nullable String, @NonNull android.os.UserHandle);
		ctor public AppTarget(@NonNull android.app.prediction.AppTargetId, @NonNull android.content.pm.ShortcutInfo, @Nullable String);
		method public int describeContents();
		method @Nullable public String getClassName();
		method @NonNull public android.app.prediction.AppTargetId getId();
		@@ -1051,6 +1054,7 @@ package android.app.prediction {
		}

		public final class AppTargetId implements android.os.Parcelable {
		ctor public AppTargetId(@NonNull String);
		method public int describeContents();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.app.prediction.AppTargetId> CREATOR;

api/test-current.txt

+103 −0

Original line number	Diff line number	Diff line
		@@ -332,6 +332,91 @@ package android.app.backup {

		}

		package android.app.prediction {

		public final class AppPredictionContext implements android.os.Parcelable {
		method public int describeContents();
		method @Nullable public android.os.Bundle getExtras();
		method @NonNull public String getPackageName();
		method public int getPredictedTargetCount();
		method public String getUiSurface();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.app.prediction.AppPredictionContext> CREATOR;
		}

		public static final class AppPredictionContext.Builder {
		ctor public AppPredictionContext.Builder(@NonNull android.content.Context);
		method public android.app.prediction.AppPredictionContext build();
		method public android.app.prediction.AppPredictionContext.Builder setExtras(@Nullable android.os.Bundle);
		method public android.app.prediction.AppPredictionContext.Builder setPredictedTargetCount(int);
		method public android.app.prediction.AppPredictionContext.Builder setUiSurface(@Nullable String);
		}

		public final class AppPredictionManager {
		method public android.app.prediction.AppPredictor createAppPredictionSession(@NonNull android.app.prediction.AppPredictionContext);
		}

		public final class AppPredictionSessionId implements android.os.Parcelable {
		method public int describeContents();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.app.prediction.AppPredictionSessionId> CREATOR;
		}

		public final class AppPredictor {
		method public void destroy();
		method public android.app.prediction.AppPredictionSessionId getSessionId();
		method public void notifyAppTargetEvent(@NonNull android.app.prediction.AppTargetEvent);
		method public void notifyLocationShown(@NonNull String, @NonNull java.util.List<android.app.prediction.AppTargetId>);
		method public void registerPredictionUpdates(@NonNull java.util.concurrent.Executor, @NonNull android.app.prediction.AppPredictor.Callback);
		method public void requestPredictionUpdate();
		method @Nullable public void sortTargets(@NonNull java.util.List<android.app.prediction.AppTarget>, @NonNull java.util.concurrent.Executor, @NonNull java.util.function.Consumer<java.util.List<android.app.prediction.AppTarget>>);
		method public void unregisterPredictionUpdates(@NonNull android.app.prediction.AppPredictor.Callback);
		}

		public static interface AppPredictor.Callback {
		method public void onTargetsAvailable(@NonNull java.util.List<android.app.prediction.AppTarget>);
		}

		public final class AppTarget implements android.os.Parcelable {
		ctor public AppTarget(@NonNull android.app.prediction.AppTargetId, @NonNull String, @Nullable String, @NonNull android.os.UserHandle);
		method public int describeContents();
		method @Nullable public String getClassName();
		method @NonNull public android.app.prediction.AppTargetId getId();
		method @NonNull public String getPackageName();
		method public int getRank();
		method @Nullable public android.content.pm.ShortcutInfo getShortcutInfo();
		method @NonNull public android.os.UserHandle getUser();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.app.prediction.AppTarget> CREATOR;
		}

		public final class AppTargetEvent implements android.os.Parcelable {
		method public int describeContents();
		method @NonNull public int getAction();
		method @NonNull public String getLaunchLocation();
		method @Nullable public android.app.prediction.AppTarget getTarget();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final int ACTION_DISMISS = 2; // 0x2
		field public static final int ACTION_LAUNCH = 1; // 0x1
		field public static final int ACTION_PIN = 3; // 0x3
		field public static final android.os.Parcelable.Creator<android.app.prediction.AppTargetEvent> CREATOR;
		}

		public static final class AppTargetEvent.Builder {
		ctor public AppTargetEvent.Builder(@Nullable android.app.prediction.AppTarget, int);
		method public android.app.prediction.AppTargetEvent build();
		method public android.app.prediction.AppTargetEvent.Builder setLaunchLocation(String);
		}

		public final class AppTargetId implements android.os.Parcelable {
		ctor public AppTargetId(@NonNull String);
		method public int describeContents();
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.app.prediction.AppTargetId> CREATOR;
		}

		}

		package android.app.role {

		public final class RoleManager {
		@@ -1774,6 +1859,24 @@ package android.security.keystore {

		}

		package android.service.appprediction {

		public abstract class AppPredictionService extends android.app.Service {
		ctor public AppPredictionService();
		method @MainThread public abstract void onAppTargetEvent(@NonNull android.app.prediction.AppPredictionSessionId, @NonNull android.app.prediction.AppTargetEvent);
		method public final android.os.IBinder onBind(android.content.Intent);
		method public void onCreatePredictionSession(@NonNull android.app.prediction.AppPredictionContext, @NonNull android.app.prediction.AppPredictionSessionId);
		method @MainThread public void onDestroyPredictionSession(@NonNull android.app.prediction.AppPredictionSessionId);
		method @MainThread public abstract void onLocationShown(@NonNull android.app.prediction.AppPredictionSessionId, @NonNull String, @NonNull java.util.List<android.app.prediction.AppTargetId>);
		method @MainThread public abstract void onRequestPredictionUpdate(@NonNull android.app.prediction.AppPredictionSessionId);
		method @MainThread public abstract void onSortAppTargets(@NonNull android.app.prediction.AppPredictionSessionId, @NonNull java.util.List<android.app.prediction.AppTarget>, @NonNull android.os.CancellationSignal, @NonNull java.util.function.Consumer<java.util.List<android.app.prediction.AppTarget>>);
		method @MainThread public void onStartPredictionUpdates();
		method @MainThread public void onStopPredictionUpdates();
		method public final void updatePredictions(@NonNull android.app.prediction.AppPredictionSessionId, @NonNull java.util.List<android.app.prediction.AppTarget>);
		}

		}

		package android.service.autofill {

		public abstract class AutofillFieldClassificationService extends android.app.Service {

core/java/android/app/prediction/AppPredictionContext.java

+18 −0

Original line number	Diff line number	Diff line
		@@ -18,6 +18,7 @@ package android.app.prediction;
		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.content.Context;
		import android.os.Bundle;
		import android.os.Parcel;
		@@ -29,6 +30,7 @@ import android.os.Parcelable;
		* @hide
		*/
		@SystemApi
		@TestApi
		public final class AppPredictionContext implements Parcelable {

		private final int mPredictedTargetCount;
		@@ -72,6 +74,17 @@ public final class AppPredictionContext implements Parcelable {
		return mExtras;
		}

		@Override
		public boolean equals(Object o) {
		if (o == this) return true;
		if (!getClass().equals(o != null ? o.getClass() : null)) return false;

		AppPredictionContext other = (AppPredictionContext) o;
		return mPredictedTargetCount == other.mPredictedTargetCount
		&& mUiSurface.equals(other.mUiSurface)
		&& mPackageName.equals(other.mPackageName);
		}

		@Override
		public int describeContents() {
		return 0;
		@@ -104,6 +117,7 @@ public final class AppPredictionContext implements Parcelable {
		* @hide
		*/
		@SystemApi
		@TestApi
		public static final class Builder {

		@NonNull
		@@ -116,8 +130,12 @@ public final class AppPredictionContext implements Parcelable {
		private Bundle mExtras;

		/**
		* TODO(b/123591863): Add java docs
		*
		* @hide
		*/
		@SystemApi
		@TestApi
		public Builder(@NonNull Context context) {
		mPackageName = context.getPackageName();
		}

core/java/android/app/prediction/AppPredictionManager.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@ package android.app.prediction;

		import android.annotation.NonNull;
		import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.content.Context;

		import com.android.internal.util.Preconditions;
		@@ -26,6 +27,7 @@ import com.android.internal.util.Preconditions;
		* @hide
		*/
		@SystemApi
		@TestApi
		public final class AppPredictionManager {

		private final Context mContext;

core/java/android/app/prediction/AppPredictionSessionId.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,7 @@ package android.app.prediction;

		import android.annotation.NonNull;
		import android.annotation.SystemApi;
		import android.annotation.TestApi;
		import android.os.Parcel;
		import android.os.Parcelable;

		@@ -26,6 +27,7 @@ import android.os.Parcelable;
		* @hide
		*/
		@SystemApi
		@TestApi
		public final class AppPredictionSessionId implements Parcelable {

		private final String mId;