From 9918df01af799a2849b17908c32e5894278990ff Mon Sep 17 00:00:00 2001
From: Evan Rosky <erosky@google.com>
Date: Tue, 1 Mar 2022 11:09:21 -0800
Subject: [PATCH] Don't use incorrect inputconsumers during recents animation

Shell transitions resumes launcher. This was causing logic in
launcher to pick incorrect inputconsumers which resulted in
aborting animation logic.

Bug: 220196913
Test: quickswitch very quickly
Change-Id: I66d894436a6cc6eae57d505db8a7abf6c10ab00f
---
 .../src/com/android/quickstep/TouchInteractionService.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/quickstep/src/com/android/quickstep/TouchInteractionService.java b/quickstep/src/com/android/quickstep/TouchInteractionService.java
index fc5f34df9a..b224089fe8 100644
--- a/quickstep/src/com/android/quickstep/TouchInteractionService.java
+++ b/quickstep/src/com/android/quickstep/TouchInteractionService.java
@@ -762,7 +762,10 @@ public class TouchInteractionService extends Service
         } else if (gestureState.getRunningTask() == null) {
             return getDefaultInputConsumer();
         } else if (previousGestureState.isRunningAnimationToLauncher()
-                || gestureState.getActivityInterface().isResumed()
+                || (gestureState.getActivityInterface().isResumed()
+                        // with shell-transitions, home is resumed during recents animation, so
+                        // explicitly check against recents animation too.
+                        && !previousGestureState.isRecentsAnimationRunning())
                 || forceOverviewInputConsumer) {
             return createOverviewInputConsumer(
                     previousGestureState, gestureState, event, forceOverviewInputConsumer);