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

Commit e1de9f67 authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Fix black Keyguard 

When a window has both the flag fullscreen and the dismiss Keyguard
flag, we end up in a state where we hide the status bar window but
all other windows, because mShowingLockscreen nevers gets set
correctly. Move it up so we always set it no matter whether the
status bar window was visible.

Bug: 22875357
Change-Id: I7953fe7100cc99fe8fb7424a9b311b4630426657
parent 629909e0

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

+1 −3
Original line number Diff line number Diff line
@@ -4388,6 +4388,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        if (attrs.type == TYPE_STATUS_BAR) {

            if ((attrs.privateFlags & PRIVATE_FLAG_KEYGUARD) != 0) {

                mForceStatusBarFromKeyguard = true;

                mShowingLockscreen = true;

            }

            if ((attrs.privateFlags & PRIVATE_FLAG_FORCE_STATUS_BAR_VISIBLE_TRANSPARENT) != 0) {

                mForceStatusBarTransparent = true;
@@ -4408,9 +4409,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    mForceStatusBar = true;

                }

            }

            if ((attrs.privateFlags & PRIVATE_FLAG_KEYGUARD) != 0) {

                mShowingLockscreen = true;

            }

            if (attrs.type == TYPE_DREAM) {

                // If the lockscreen was showing when the dream started then wait

                // for the dream to draw before hiding the lockscreen.