Update launcher call to fetch recent tasks

- Always just fetch the tasks that will end up in recents

Bug: 152133859
Test: Manual, swipe up with pip/assistant and verify nothing
      changed
Change-Id: I41719e111cba85da7e93f65681b7b50b4c5c4a46
This commit is contained in:
Winson Chung
2020-03-22 13:11:29 -07:00
parent 6b516bd63e
commit 8e714d42ae
@@ -439,7 +439,7 @@ public class TouchInteractionService extends Service implements PluginListener<O
GestureState newGestureState = new GestureState(mOverviewComponentObserver,
ActiveGestureLog.INSTANCE.generateAndSetLogId());
newGestureState.updateRunningTask(TraceHelper.whitelistIpcs("getRunningTask.0",
() -> mAM.getRunningTask(0)));
() -> mAM.getRunningTask(true /* filterOnlyVisibleRecents */)));
if (mDeviceState.isInSwipeUpTouchRegion(event)) {
mConsumer.onConsumerAboutToBeSwitched();
@@ -567,18 +567,10 @@ public class TouchInteractionService extends Service implements PluginListener<O
return createDeviceLockedInputConsumer(gestureState);
}
boolean forceOverviewInputConsumer = false;
if (AssistantUtilities.isExcludedAssistant(gestureState.getRunningTask())) {
// In the case where we are in the excluded assistant state, ignore it and treat the
// running activity as the task behind the assistant
gestureState.updateRunningTask(TraceHelper.whitelistIpcs("getRunningTask.assistant",
() -> mAM.getRunningTask(ACTIVITY_TYPE_ASSISTANT /* ignoreActivityType */)));
ComponentName homeComponent = mOverviewComponentObserver.getHomeIntent().getComponent();
ComponentName runningComponent =
gestureState.getRunningTask().baseIntent.getComponent();
forceOverviewInputConsumer =
runningComponent != null && runningComponent.equals(homeComponent);
}
RunningTaskInfo runningTask = gestureState.getRunningTask();
ComponentName homeComponent = mOverviewComponentObserver.getHomeIntent().getComponent();
boolean forceOverviewInputConsumer = runningTask != null
&& runningTask.baseIntent.getComponent().equals(homeComponent);
if (previousGestureState.getFinishingRecentsAnimationTaskId() > 0) {
// If the finish animation was interrupted, then continue using the other activity input