Snap for 6342437 from f1ab2b2a9a6f7aaf09211cbc75809ccd947bef3d to rvc-release (2a6555e7) · Commits · e / os / android_packages_apps_Trebuchet

quickstep/recents_ui_overrides/src/com/android/quickstep/TouchInteractionService.java

+5 −13

Original line number	Diff line number	Diff line
		@@ -442,7 +442,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();
		@@ -577,18 +577,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 */)));
		RunningTaskInfo runningTask = gestureState.getRunningTask();
		ComponentName homeComponent = mOverviewComponentObserver.getHomeIntent().getComponent();
		ComponentName runningComponent =
		gestureState.getRunningTask().baseIntent.getComponent();
		forceOverviewInputConsumer =
		runningComponent != null && runningComponent.equals(homeComponent);
		}
		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