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

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

am 9bf7f893: am 93df07a1: Merge "Show the keyguard if unsecure window on top.... 

am 9bf7f893: am 93df07a1: Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev

* commit '9bf7f893':
  Show the keyguard if unsecure window on top. DO NOT MERGE.
parents efae1ff2 9bf7f893

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

+31 −24
Original line number Diff line number Diff line
@@ -381,6 +381,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    static final Rect mTmpNavigationFrame = new Rect();



    WindowState mTopFullscreenOpaqueWindowState;

    boolean mHideWindowBehindKeyguard;

    boolean mTopIsFullscreen;

    boolean mForceStatusBar;

    boolean mForceStatusBarFromKeyguard;
@@ -3365,6 +3366,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    @Override

    public void beginPostLayoutPolicyLw(int displayWidth, int displayHeight) {

        mTopFullscreenOpaqueWindowState = null;

        mHideWindowBehindKeyguard = false;

        mForceStatusBar = false;

        mForceStatusBarFromKeyguard = false;

        mForcingShowNavBar = false;
@@ -3400,7 +3402,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            if (attrs.type == TYPE_KEYGUARD) {

                mShowingLockscreen = true;

            }

            boolean applyWindow = attrs.type >= FIRST_APPLICATION_WINDOW

            boolean appWindow = attrs.type >= FIRST_APPLICATION_WINDOW

                    && attrs.type <= LAST_APPLICATION_WINDOW;

            if (attrs.type == TYPE_DREAM) {

                // If the lockscreen was showing when the dream started then wait
@@ -3408,16 +3410,18 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                if (!mDreamingLockscreen

                        || (win.isVisibleLw() && win.hasDrawnLw())) {

                    mShowingDream = true;

                    applyWindow = true;

                    appWindow = true;

                }

            }

            if (applyWindow

                    && attrs.x == 0 && attrs.y == 0



            final boolean showWhenLocked = (attrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0;

            if (appWindow) {

                if (attrs.x == 0 && attrs.y == 0

                        && attrs.width == WindowManager.LayoutParams.MATCH_PARENT

                        && attrs.height == WindowManager.LayoutParams.MATCH_PARENT) {

                    if (DEBUG_LAYOUT) Slog.v(TAG, "Fullscreen window: " + win);

                    mTopFullscreenOpaqueWindowState = win;

                if ((attrs.flags & FLAG_SHOW_WHEN_LOCKED) != 0) {

                    if (showWhenLocked && !mHideWindowBehindKeyguard) {

                        if (DEBUG_LAYOUT) Slog.v(TAG, "Setting mHideLockScreen to true by win " + win);

                        mHideLockScreen = true;

                        mForceStatusBarFromKeyguard = false;
@@ -3433,6 +3437,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    if ((attrs.flags & FLAG_ALLOW_LOCK_WHILE_SCREEN_ON) != 0) {

                        mAllowLockscreenWhenOn = true;

                    }

                } else if (!showWhenLocked) {

                    mHideWindowBehindKeyguard = true;

                }

            }

        }

    }
@@ -3517,7 +3524,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        if (mKeyguard != null) {

            if (localLOGV) Slog.v(TAG, "finishPostLayoutPolicyLw: mHideKeyguard="

                    + mHideLockScreen);

            if (mDismissKeyguard != DISMISS_KEYGUARD_NONE && !mKeyguardDelegate.isSecure()) {

            if (mDismissKeyguard != DISMISS_KEYGUARD_NONE && !isKeyguardSecure()) {

                if (mKeyguard.hideLw(true)) {

                    changes |= FINISH_LAYOUT_REDO_LAYOUT

                            | FINISH_LAYOUT_REDO_CONFIG