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

Commit 95a8b32c authored by Robin Lee's avatar Robin Lee
Browse files

Don't let Keyguard play un/occlude when not visible 

When SysUI marks the device as unlocked without going through
keyguardGoingAway, the system server may still be in the process
of creating a transition and that transition will include
information about whether an occluding/unoccluding app is coming
in. Drop the transition from KeyguardTransitionHandler so that it
doesn't get confused and start showing the bouncer again.

It will still get to commit the state after all transitions play.

Change-Id: Iabce80a9f08829750c90acaafb3f3f3fb5f225dc
Test: atest CtsWindowManagerDeviceKeyguard:KeyguardTests
Fix: 303056717
parent 688d9e58

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

+20 −15
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM; 
import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;

import static android.view.WindowManager.KEYGUARD_VISIBILITY_TRANSIT_FLAGS;

import static android.view.WindowManager.TRANSIT_FLAG_KEYGUARD_GOING_AWAY;

import static android.view.WindowManager.TRANSIT_FLAG_KEYGUARD_LOCKED;

import static android.view.WindowManager.TRANSIT_FLAG_KEYGUARD_OCCLUDING;

import static android.view.WindowManager.TRANSIT_FLAG_KEYGUARD_UNOCCLUDING;

import static android.view.WindowManager.TRANSIT_SLEEP;
@@ -134,6 +135,9 @@ public class KeyguardTransitionHandler implements Transitions.TransitionHandler 
                    "going-away",

                    transition, info, startTransaction, finishTransaction, finishCallback);

        }



        // Occlude/unocclude animations are only played if the keyguard is locked.

        if ((info.getFlags() & TRANSIT_FLAG_KEYGUARD_LOCKED) != 0) {

            if ((info.getFlags() & TRANSIT_FLAG_KEYGUARD_OCCLUDING) != 0) {

                if (hasOpeningDream(info)) {

                    return startAnimation(mOccludeByDreamTransition,
@@ -148,11 +152,12 @@ public class KeyguardTransitionHandler implements Transitions.TransitionHandler 
                return startAnimation(mUnoccludeTransition,

                        "unocclude",

                        transition, info, startTransaction, finishTransaction, finishCallback);

        } else {

            }

        }



        Log.i(TAG, "Refused to play keyguard transition: " + info);

        return false;

    }

    }



    private boolean startAnimation(IRemoteTransition remoteHandler, String description,

            @NonNull IBinder transition, @NonNull TransitionInfo info,