commit 7e1f38a7a0517371bb1d50c41320870478fae3fb
author Winson Chung <winsonc@google.com> Fri May 10 17:44:26 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri May 10 17:44:26 2024 +0000
tree 27e09088f12625566429f824134cb66889390cde
parent 108c0560a0f83e34b7e9f8193da2487affea07a4
parent dbc248a1e6ec62bb673701eb1bccb923e123aaa6

Merge "Ensure that we consume the original mixed transition when handling keyguard" into main

libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java

diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java
index 4d02ec2..968b27b 100644
--- a/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java
+++ b/libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java
@@ -426,7 +426,8 @@
                     ProtoLog.w(ShellProtoLogGroup.WM_SHELL_TRANSITIONS,
                             "Converting mixed transition into a keyguard transition");
                     // Consume the original mixed transition
-                    onTransitionConsumed(transition, false, null);
+                    mActiveTransitions.remove(mixed);
+                    mixed.onTransitionConsumed(transition, false, null);
                     return true;
                 } else {
                     // Keyguard handler cannot handle it, process through original mixed