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

Commit 16c234b5 authored by Robin Lee's avatar Robin Lee Committed by Android (Google) Code Review
Browse files

Merge "Don't play transitions if keyguard didn't register" into main

parents 17e845f2 8a20c08f
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -159,9 +159,15 @@ public class KeyguardTransitionHandler implements Transitions.TransitionHandler
            @NonNull SurfaceControl.Transaction startTransaction,
            @NonNull SurfaceControl.Transaction finishTransaction,
            @NonNull TransitionFinishCallback finishCallback) {

        if (remoteHandler == null) {
            ProtoLog.e(ShellProtoLogGroup.WM_SHELL_TRANSITIONS,
                    "missing handler for keyguard %s transition", description);
            return false;
        }

        ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS,
                "start keyguard %s transition, info = %s", description, info);

        try {
            mStartedTransitions.put(transition,
                    new StartedTransition(info, finishTransaction, remoteHandler));