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

Commit fe9dfcfd authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of ['googleplex-android-review.googlesource.com/27268320'] into 24Q3-release. 

Change-Id: I4b8b187eeffece12d02b132ba4f7ea46bcee4acf
parents 08892a78 e93564bd

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