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

Commit dd8b9408 authored by Robin Lee's avatar Robin Lee Committed by Cherrypicker Worker
Browse files

Don't play transitions if keyguard didn't register 

This could happen:

  (a) if something went wrong in early setup
  (b) if SysUI crashed and received transitions while restarting

Bug: 302538471
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:8a20c08f0db20b3461903ecd387bd63b5dd7f149)
Merged-In: Iff0f1c4af9e1da96b7bbd04bd45da9f5330fd9b1
Change-Id: Iff0f1c4af9e1da96b7bbd04bd45da9f5330fd9b1
parent bd33753f

libs/WindowManager/Shell/src/com/android/wm/shell/keyguard/KeyguardTransitionHandler.java

+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));