From 6d1dcc2b4e2edb88077d994ab406be7e3d121f31 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Sun, 25 Aug 2024 20:42:44 +0000 Subject: [PATCH] Fix regression in ending recents transition while locked - Prior to ag/28807475 we would not finish the recents transition when ending to home while the device is locked, so we need to continue to skip that now. Flag: EXEMPT bugfix Bug: 361950809 Bug: 359608026 Test: Lock the device, open camera and swipe up Change-Id: I66ba065ebd0084ecd51ea803e88e31bf8acbfdcb --- .../quickstep/inputconsumers/DeviceLockedInputConsumer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java b/quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java index 3ca719188e..14f47d13a7 100644 --- a/quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java +++ b/quickstep/src/com/android/quickstep/inputconsumers/DeviceLockedInputConsumer.java @@ -277,7 +277,7 @@ public class DeviceLockedInputConsumer implements InputConsumer, } private void endRemoteAnimation() { - if (mRecentsAnimationController != null) { + if (!mHomeLaunched && mRecentsAnimationController != null) { mRecentsAnimationController.finishController( false /* toRecents */, null /* callback */, false /* sendUserLeaveHint */); }