Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 663f3968 authored by Song Hu's avatar Song Hu Committed by Automerger Merge Worker
Browse files

Merge "Send onCreatePredictionSession, sortAppTargets, requestPredictionUpdate... 

Merge "Send onCreatePredictionSession, sortAppTargets, requestPredictionUpdate immediately instead of sending them to main thread Looper queue of ChooserActivity." into rvc-dev am: f52438f9

Change-Id: I4107cb2da5aa9675441d95be9b43ed1b8e3a6d8f
parents b2edc266 f52438f9

core/java/com/android/internal/infra/AbstractRemoteService.java

+14 −0
Original line number Diff line number Diff line
@@ -321,6 +321,20 @@ public abstract class AbstractRemoteService<S extends AbstractRemoteService<S, I 
                obtainMessage(AbstractRemoteService::handlePendingRequest, this, asyncRequest));

    }



    /**

     * Executes an async request immediately instead of sending it to Handler queue as what

     * {@link scheduleAsyncRequest} does.

     *

     * <p>This request is not expecting a callback from the service, hence it's represented by

     * a simple {@link Runnable}.

     */

    protected void executeAsyncRequest(@NonNull AsyncRequest<I> request) {

        // TODO(b/117779333): fix generics below

        @SuppressWarnings({"unchecked", "rawtypes"})

        final MyAsyncPendingRequest<S, I> asyncRequest = new MyAsyncPendingRequest(this, request);

        handlePendingRequest(asyncRequest);

    }



    private void cancelScheduledUnbind() {

        mHandler.removeMessages(MSG_UNBIND);

    }

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

+17 −10
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ public class AppPredictionPerUserService extends 
                    this::removeAppPredictionSessionInfo));

        }

        final boolean serviceExists = resolveService(sessionId, s ->

                s.onCreatePredictionSession(context, sessionId));

                s.onCreatePredictionSession(context, sessionId), true);

        if (!serviceExists) {

            mSessionInfos.remove(sessionId);

        }
@@ -132,7 +132,7 @@ public class AppPredictionPerUserService extends 
    @GuardedBy("mLock")

    public void notifyAppTargetEventLocked(@NonNull AppPredictionSessionId sessionId,

            @NonNull AppTargetEvent event) {

        resolveService(sessionId, s -> s.notifyAppTargetEvent(sessionId, event));

        resolveService(sessionId, s -> s.notifyAppTargetEvent(sessionId, event), false);

    }



    /**
@@ -142,7 +142,7 @@ public class AppPredictionPerUserService extends 
    public void notifyLaunchLocationShownLocked(@NonNull AppPredictionSessionId sessionId,

            @NonNull String launchLocation, @NonNull ParceledListSlice targetIds) {

        resolveService(sessionId, s ->

                s.notifyLaunchLocationShown(sessionId, launchLocation, targetIds));

                s.notifyLaunchLocationShown(sessionId, launchLocation, targetIds), false);

    }



    /**
@@ -151,7 +151,7 @@ public class AppPredictionPerUserService extends 
    @GuardedBy("mLock")

    public void sortAppTargetsLocked(@NonNull AppPredictionSessionId sessionId,

            @NonNull ParceledListSlice targets, @NonNull IPredictionCallback callback) {

        resolveService(sessionId, s -> s.sortAppTargets(sessionId, targets, callback));

        resolveService(sessionId, s -> s.sortAppTargets(sessionId, targets, callback), true);

    }



    /**
@@ -161,7 +161,7 @@ public class AppPredictionPerUserService extends 
    public void registerPredictionUpdatesLocked(@NonNull AppPredictionSessionId sessionId,

            @NonNull IPredictionCallback callback) {

        final boolean serviceExists = resolveService(sessionId, s ->

                s.registerPredictionUpdates(sessionId, callback));

                s.registerPredictionUpdates(sessionId, callback), false);

        final AppPredictionSessionInfo sessionInfo = mSessionInfos.get(sessionId);

        if (serviceExists && sessionInfo != null) {

            sessionInfo.addCallbackLocked(callback);
@@ -175,7 +175,7 @@ public class AppPredictionPerUserService extends 
    public void unregisterPredictionUpdatesLocked(@NonNull AppPredictionSessionId sessionId,

            @NonNull IPredictionCallback callback) {

        final boolean serviceExists = resolveService(sessionId, s ->

                s.unregisterPredictionUpdates(sessionId, callback));

                s.unregisterPredictionUpdates(sessionId, callback), false);

        final AppPredictionSessionInfo sessionInfo = mSessionInfos.get(sessionId);

        if (serviceExists && sessionInfo != null) {

            sessionInfo.removeCallbackLocked(callback);
@@ -187,7 +187,7 @@ public class AppPredictionPerUserService extends 
     */

    @GuardedBy("mLock")

    public void requestPredictionUpdateLocked(@NonNull AppPredictionSessionId sessionId) {

        resolveService(sessionId, s -> s.requestPredictionUpdate(sessionId));

        resolveService(sessionId, s -> s.requestPredictionUpdate(sessionId), true);

    }



    /**
@@ -196,7 +196,7 @@ public class AppPredictionPerUserService extends 
    @GuardedBy("mLock")

    public void onDestroyPredictionSessionLocked(@NonNull AppPredictionSessionId sessionId) {

        final boolean serviceExists = resolveService(sessionId, s ->

                s.onDestroyPredictionSession(sessionId));

                s.onDestroyPredictionSession(sessionId), false);

        final AppPredictionSessionInfo sessionInfo = mSessionInfos.get(sessionId);

        if (serviceExists && sessionInfo != null) {

            sessionInfo.destroy();
@@ -304,7 +304,8 @@ public class AppPredictionPerUserService extends 
    @GuardedBy("mLock")

    @Nullable

    protected boolean resolveService(@NonNull final AppPredictionSessionId sessionId,

            @NonNull final AbstractRemoteService.AsyncRequest<IPredictionService> cb) {

            @NonNull final AbstractRemoteService.AsyncRequest<IPredictionService> cb,

            boolean sendImmediately) {

        final AppPredictionSessionInfo sessionInfo = mSessionInfos.get(sessionId);

        if (sessionInfo == null) return false;

        if (sessionInfo.mUsesPeopleService) {
@@ -322,8 +323,14 @@ public class AppPredictionPerUserService extends 
        } else {

            final RemoteAppPredictionService service = getRemoteServiceLocked();

            if (service != null) {

                // TODO(b/155887722): implement a priority system so that latency-sensitive

                // requests gets executed first.

                if (sendImmediately) {

                    service.executeOnResolvedService(cb);

                } else {

                    service.scheduleOnResolvedService(cb);

                }

            }

            return service != null;

        }

    }

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

+7 −0
Original line number Diff line number Diff line
@@ -79,6 +79,13 @@ public class RemoteAppPredictionService extends 
        scheduleAsyncRequest(request);

    }



    /**

     * Execute async request on remote service immediately instead of sending it to Handler queue.

     */

    public void executeOnResolvedService(@NonNull AsyncRequest<IPredictionService> request) {

        executeAsyncRequest(request);

    }



    /**

     * Failure callback

     */