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

Commit 2ad69dd3 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Don't play transitions if keyguard didn't register" into udc-qpr-dev am: 9627b455 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24928400



Change-Id: I7623556695d90d1a1b2386bcab28ed54a7a71504
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ece084bc 9627b455

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