Merge "Show the keyguard if unsecure window on top" (a002fab7) · Commits · e / os / android_frameworks_base

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;
		}