Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Song Hu
2020-05-06 19:03:46 +00:00
committed by Android (Google) Code Review
parent 7c7ca77ed5 d52863d12b
commit f52438f9a2
3 changed files with 38 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/java/com/android/internal/infra/AbstractRemoteService.java
View File

@@ -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);
}

27
services/appprediction/java/com/android/server/appprediction/AppPredictionPerUserService.java
View File

@@ -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,7 +323,13 @@ public class AppPredictionPerUserService extends
} else {
final RemoteAppPredictionService service = getRemoteServiceLocked();
if (service != null) {
service.scheduleOnResolvedService(cb);
// 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;
}

7
services/appprediction/java/com/android/server/appprediction/RemoteAppPredictionService.java
View File

@@ -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
*/