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

Commit 80f99121 authored by Craig Mautner's avatar Craig Mautner Committed by Gerrit Code Review
Browse files

Merge "Prevent infinite layout and wallpaper flashing"

parents b6feabcf 517129cf

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+3 −2
Original line number Diff line number Diff line
@@ -4120,8 +4120,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    /** {@inheritDoc} */

    @Override

    public int finishPostLayoutPolicyLw() {

        if (mWinShowWhenLocked != null &&

                mWinShowWhenLocked != mTopFullscreenOpaqueWindowState) {

        if (mWinShowWhenLocked != null && mTopFullscreenOpaqueWindowState != null &&

                mWinShowWhenLocked.getAppToken() != mTopFullscreenOpaqueWindowState.getAppToken()

                && isKeyguardLocked()) {

            // A dialog is dismissing the keyguard. Put the wallpaper behind it and hide the

            // fullscreen window.

            // TODO: Make sure FLAG_SHOW_WALLPAPER is restored when dialog is dismissed. Or not.