commit e584fb3b31985fb4b4eba345c51ae543428de67a
author Winson Chung <winsonc@google.com> Mon Aug 26 16:12:18 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Aug 26 16:12:18 2024 +0000
tree 7eba7fed87053da63740ee7644a37fdd2a5108b9
parent d56fb26f840214a511ec65ae57bce4cbd866d0c7
parent 6d1dcc2b4e2edb88077d994ab406be7e3d121f31

Merge "Fix regression in ending recents transition while locked" into main

quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java

diff --git a/quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java
index 3ca7191..14f47d1 100644
--- a/quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java
+++ b/quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java
@@ -277,7 +277,7 @@
     }
 
     private void endRemoteAnimation() {
-        if (mRecentsAnimationController != null) {
+        if (!mHomeLaunched && mRecentsAnimationController != null) {
             mRecentsAnimationController.finishController(
                     false /* toRecents */, null /* callback */, false /* sendUserLeaveHint */);
         }