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

Commit da09ae38 authored by Craig Mautner's avatar Craig Mautner
Browse files

Show the keyguard if unsecure window on top 

When traversing windows save the fact that windows above the topmost
fullscreen window do not hide the lockscreen. If there is such a
window don't show it.

(cherry picked from commit ab55e524)

Fixes bug 13225149.

Change-Id: Ib6f33cbcfb2f60d8957a9184729ecdec80c6a236
parent 9428eb82

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

+16 −12
Original line number Diff line number Diff line
@@ -3417,19 +3417,23 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                        && attrs.height == WindowManager.LayoutParams.MATCH_PARENT) {

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

                    mTopFullscreenOpaqueWindowState = win;

                    if (showWhenLocked && !mHideWindowBehindKeyguard) {

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

                    if (!mHideWindowBehindKeyguard) {

                        if (showWhenLocked) {

                            if (DEBUG_LAYOUT) Slog.v(TAG,

                                    "Setting mHideLockScreen to true by win " + win);

                            mHideLockScreen = true;

                            mForceStatusBarFromKeyguard = false;

                        }

                        if ((fl & FLAG_DISMISS_KEYGUARD) != 0

                                && mDismissKeyguard == DISMISS_KEYGUARD_NONE) {

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

                            if (DEBUG_LAYOUT) Slog.v(TAG,

                                    "Setting mDismissKeyguard true by win " + win);

                            mDismissKeyguard = mWinDismissingKeyguard == win ?

                                    DISMISS_KEYGUARD_CONTINUE : DISMISS_KEYGUARD_START;

                            mWinDismissingKeyguard = win;

                            mForceStatusBarFromKeyguard = mShowingLockscreen && isKeyguardSecure();

                        }

                    }

                    if ((fl & FLAG_ALLOW_LOCK_WHILE_SCREEN_ON) != 0) {

                        mAllowLockscreenWhenOn = true;

                    }