diff options
| author | 2024-05-10 17:44:26 +0000 | |
|---|---|---|
| committer | 2024-05-10 17:44:26 +0000 | |
| commit | 7e1f38a7a0517371bb1d50c41320870478fae3fb (patch) | |
| tree | 27e09088f12625566429f824134cb66889390cde | |
| parent | 108c0560a0f83e34b7e9f8193da2487affea07a4 (diff) | |
| parent | dbc248a1e6ec62bb673701eb1bccb923e123aaa6 (diff) | |
Merge "Ensure that we consume the original mixed transition when handling keyguard" into main
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/transition/DefaultMixedHandler.java | 3 |
1 files changed, 2 insertions, 1 deletions
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 4d02ec26e18e..968b27b62490 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 @@ public class DefaultMixedHandler implements MixedTransitionHandler, 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 |