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

Commit c5e73bf9 authored by Craig Mautner's avatar Craig Mautner Committed by Android Git Automerger
Browse files

am da506ffa: am 14818725: am 80f99121: Merge "Prevent infinite layout and wallpaper flashing" 

* commit 'da506ffa':
  Prevent infinite layout and wallpaper flashing
parents b2011104 da506ffa

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

+3 −2
Original line number Diff line number Diff line
@@ -4215,8 +4215,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.