commit 684de2d7d96a0589f306b1b2fae3448a2d532a5a
author Ming-Shin Lu <lumark@google.com> Mon Jan 17 13:02:30 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jan 17 13:02:30 2022 +0000
tree d32a03857379262decbad3d195277c365f14b069
parent 40cfea7d79528c25c9f6ee50177f4e8a2b2b3039
parent 1f5f0d0039a9efd6924ad2fcc8eb310a50adb75b

Merge "ShellTranstion: Apply recents input consumer when the window in transion"

services/core/java/com/android/server/wm/InputMonitor.java

diff --git a/services/core/java/com/android/server/wm/InputMonitor.java b/services/core/java/com/android/server/wm/InputMonitor.java
index 4225f21..44818a8 100644
--- a/services/core/java/com/android/server/wm/InputMonitor.java
+++ b/services/core/java/com/android/server/wm/InputMonitor.java
@@ -399,10 +399,11 @@
         if (recentsAnimationInputConsumer != null && focus != null) {
             final RecentsAnimationController recentsAnimationController =
                     mService.getRecentsAnimationController();
+            // Apply recents input consumer when the focusing window is in recents animation.
             final boolean shouldApplyRecentsInputConsumer = (recentsAnimationController != null
                     && recentsAnimationController.shouldApplyInputConsumer(focus.mActivityRecord))
                     // Shell transitions doesn't use RecentsAnimationController
-                    || getWeak(mActiveRecentsActivity) != null;
+                    || getWeak(mActiveRecentsActivity) != null && focus.inTransition();
             if (shouldApplyRecentsInputConsumer) {
                 requestFocus(recentsAnimationInputConsumer.mWindowHandle.token,
                         recentsAnimationInputConsumer.mName);