Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e1f38a7 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

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

parents 108c0560 dbc248a1

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

+2 −1
Original line number Diff line number Diff line
@@ -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