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

Commit cdccd2d6 authored by Alex Stetson's avatar Alex Stetson
Browse files

Always notify of keyguard exit animation 

When certain events, such as configuration changes, trigger between
keyguardGoingAway and setKeyguardShown, the starting the pending exit
animation will be cancelled and will notify the system of such an
occurance here. However, SystemUI never gets notified because applying
any occlusion state change returns early. Therefore, it is necessary to
always notify to start the animation to prevent an unrecoverable
inconsistent state.

Bug: 272274722
Test: manual
Change-Id: If1823781262a26d5bd2cfa8b86909e4f9892a717
parent 58a1d61a

services/core/java/com/android/server/policy/PhoneWindowManager.java

+3 −3
Original line number Diff line number Diff line
@@ -3740,15 +3740,15 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
     */

    private int handleTransitionForKeyguardLw(boolean startKeyguardExitAnimation,

            boolean notifyOccluded) {

        int redoLayout = 0;

        if (notifyOccluded) {

            final int redoLayout = applyKeyguardOcclusionChange();

            if (redoLayout != 0) return redoLayout;

            redoLayout = applyKeyguardOcclusionChange();

        }

        if (startKeyguardExitAnimation) {

            if (DEBUG_KEYGUARD) Slog.d(TAG, "Starting keyguard exit animation");

            startKeyguardExitAnimation(SystemClock.uptimeMillis());

        }

        return 0;

        return redoLayout;

    }



    // There are several different flavors of "assistant" that can be launched from