Merge "Enable App Prediction for Work Profile" (8eaa8666) · Commits · e / os / android_frameworks_base

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

+17 −4

Original line number	Diff line number	Diff line
		@@ -22,6 +22,8 @@ import android.annotation.TestApi;
		import android.os.Parcel;
		import android.os.Parcelable;

		import java.util.Objects;

		/**
		* The id for an app prediction session. See {@link AppPredictor}.
		*
		@@ -32,18 +34,28 @@ import android.os.Parcelable;
		public final class AppPredictionSessionId implements Parcelable {

		private final String mId;
		private final int mUserId;

		/**
		* Creates a new id for a prediction session.
		*
		* @hide
		*/
		public AppPredictionSessionId(@NonNull String id) {
		public AppPredictionSessionId(@NonNull final String id, final int userId) {
		mId = id;
		mUserId = userId;
		}

		private AppPredictionSessionId(Parcel p) {
		mId = p.readString();
		mUserId = p.readInt();
		}

		/**
		* @hide
		*/
		public int getUserId() {
		return mUserId;
		}

		@Override
		@@ -51,17 +63,17 @@ public final class AppPredictionSessionId implements Parcelable {
		if (!getClass().equals(o != null ? o.getClass() : null)) return false;

		AppPredictionSessionId other = (AppPredictionSessionId) o;
		return mId.equals(other.mId);
		return mId.equals(other.mId) && mUserId == other.mUserId;
		}

		@Override
		public @NonNull String toString() {
		return mId;
		return mId + "," + mUserId;
		}

		@Override
		public int hashCode() {
		return mId.hashCode();
		return Objects.hash(mId, mUserId);
		}

		@Override
		@@ -72,6 +84,7 @@ public final class AppPredictionSessionId implements Parcelable {
		@Override
		public void writeToParcel(Parcel dest, int flags) {
		dest.writeString(mId);
		dest.writeInt(mUserId);
		}

		public static final @android.annotation.NonNull Parcelable.Creator<AppPredictionSessionId> CREATOR =

core/java/android/app/prediction/AppPredictor.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -96,7 +96,7 @@ public final class AppPredictor {
		IBinder b = ServiceManager.getService(Context.APP_PREDICTION_SERVICE);
		mPredictionManager = IPredictionManager.Stub.asInterface(b);
		mSessionId = new AppPredictionSessionId(
		context.getPackageName() + ":" + UUID.randomUUID().toString());
		context.getPackageName() + ":" + UUID.randomUUID().toString(), context.getUserId());
		try {
		mPredictionManager.createPredictionSession(predictionContext, mSessionId);
		} catch (RemoteException e) {

services/appprediction/java/com/android/server/appprediction/AppPredictionManagerService.java

+16 −12

Original line number	Diff line number	Diff line
		@@ -18,12 +18,14 @@ package com.android.server.appprediction;

		import static android.Manifest.permission.MANAGE_APP_PREDICTIONS;
		import static android.Manifest.permission.PACKAGE_USAGE_STATS;
		import static android.app.ActivityManagerInternal.ALLOW_NON_FULL;
		import static android.content.Context.APP_PREDICTION_SERVICE;
		import static android.content.pm.PackageManager.PERMISSION_GRANTED;

		import android.annotation.NonNull;
		import android.annotation.Nullable;
		import android.annotation.UserIdInt;
		import android.app.ActivityManagerInternal;
		import android.app.prediction.AppPredictionContext;
		import android.app.prediction.AppPredictionSessionId;
		import android.app.prediction.AppTargetEvent;
		@@ -34,7 +36,6 @@ import android.content.pm.ParceledListSlice;
		import android.os.Binder;
		import android.os.ResultReceiver;
		import android.os.ShellCallback;
		import android.os.UserHandle;
		import android.util.Slog;

		import com.android.server.LocalServices;
		@@ -108,21 +109,21 @@ public class AppPredictionManagerService extends
		@Override
		public void createPredictionSession(@NonNull AppPredictionContext context,
		@NonNull AppPredictionSessionId sessionId) {
		runForUserLocked("createPredictionSession",
		runForUserLocked("createPredictionSession", sessionId,
		(service) -> service.onCreatePredictionSessionLocked(context, sessionId));
		}

		@Override
		public void notifyAppTargetEvent(@NonNull AppPredictionSessionId sessionId,
		@NonNull AppTargetEvent event) {
		runForUserLocked("notifyAppTargetEvent",
		runForUserLocked("notifyAppTargetEvent", sessionId,
		(service) -> service.notifyAppTargetEventLocked(sessionId, event));
		}

		@Override
		public void notifyLaunchLocationShown(@NonNull AppPredictionSessionId sessionId,
		@NonNull String launchLocation, @NonNull ParceledListSlice targetIds) {
		runForUserLocked("notifyLaunchLocationShown", (service) ->
		runForUserLocked("notifyLaunchLocationShown", sessionId, (service) ->
		service.notifyLaunchLocationShownLocked(sessionId, launchLocation, targetIds));
		}

		@@ -130,32 +131,32 @@ public class AppPredictionManagerService extends
		public void sortAppTargets(@NonNull AppPredictionSessionId sessionId,
		@NonNull ParceledListSlice targets,
		IPredictionCallback callback) {
		runForUserLocked("sortAppTargets",
		runForUserLocked("sortAppTargets", sessionId,
		(service) -> service.sortAppTargetsLocked(sessionId, targets, callback));
		}

		@Override
		public void registerPredictionUpdates(@NonNull AppPredictionSessionId sessionId,
		@NonNull IPredictionCallback callback) {
		runForUserLocked("registerPredictionUpdates",
		runForUserLocked("registerPredictionUpdates", sessionId,
		(service) -> service.registerPredictionUpdatesLocked(sessionId, callback));
		}

		public void unregisterPredictionUpdates(@NonNull AppPredictionSessionId sessionId,
		@NonNull IPredictionCallback callback) {
		runForUserLocked("unregisterPredictionUpdates",
		runForUserLocked("unregisterPredictionUpdates", sessionId,
		(service) -> service.unregisterPredictionUpdatesLocked(sessionId, callback));
		}

		@Override
		public void requestPredictionUpdate(@NonNull AppPredictionSessionId sessionId) {
		runForUserLocked("requestPredictionUpdate",
		runForUserLocked("requestPredictionUpdate", sessionId,
		(service) -> service.requestPredictionUpdateLocked(sessionId));
		}

		@Override
		public void onDestroyPredictionSession(@NonNull AppPredictionSessionId sessionId) {
		runForUserLocked("onDestroyPredictionSession",
		runForUserLocked("onDestroyPredictionSession", sessionId,
		(service) -> service.onDestroyPredictionSessionLocked(sessionId));
		}

		@@ -167,9 +168,12 @@ public class AppPredictionManagerService extends
		.exec(this, in, out, err, args, callback, resultReceiver);
		}

		private void runForUserLocked(@NonNull String func,
		@NonNull Consumer<AppPredictionPerUserService> c) {
		final int userId = UserHandle.getCallingUserId();
		private void runForUserLocked(@NonNull final String func,
		@NonNull final AppPredictionSessionId sessionId,
		@NonNull final Consumer<AppPredictionPerUserService> c) {
		ActivityManagerInternal am = LocalServices.getService(ActivityManagerInternal.class);
		final int userId = am.handleIncomingUser(Binder.getCallingPid(), Binder.getCallingUid(),
		sessionId.getUserId(), false, ALLOW_NON_FULL, null, null);

		Context ctx = getContext();
		if (!(ctx.checkCallingPermission(PACKAGE_USAGE_STATS) == PERMISSION_GRANTED

services/tests/servicestests/src/com/android/server/people/PeopleServiceTest.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -51,6 +51,7 @@ public final class PeopleServiceTest {
		private static final String APP_PREDICTION_SHARE_UI_SURFACE = "share";
		private static final int APP_PREDICTION_TARGET_COUNT = 4;
		private static final String TEST_PACKAGE_NAME = "com.example";
		private static final int USER_ID = 0;

		private PeopleServiceInternal mServiceInternal;
		private PeopleService.LocalService mLocalService;
		@@ -73,7 +74,7 @@ public final class PeopleServiceTest {
		mServiceInternal = LocalServices.getService(PeopleServiceInternal.class);
		mLocalService = (PeopleService.LocalService) mServiceInternal;

		mSessionId = new AppPredictionSessionId("abc");
		mSessionId = new AppPredictionSessionId("abc", USER_ID);
		mPredictionContext = new AppPredictionContext.Builder(mContext)
		.setUiSurface(APP_PREDICTION_SHARE_UI_SURFACE)
		.setPredictedTargetCount(APP_PREDICTION_TARGET_COUNT)