Merge "Make sure to call dismissKeyguard after setOccluded" into nyc-mr1-dev (7e8fc052) · Commits · e / os / android_frameworks_base

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

+11 −8

Original line number	Diff line number	Diff line
		@@ -5293,18 +5293,15 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		}
		} else if (mDismissKeyguard != DISMISS_KEYGUARD_NONE) {
		mKeyguardHidden = false;
		boolean willDismiss = false;
		if (mDismissKeyguard == DISMISS_KEYGUARD_START) {
		boolean dismissKeyguard = false;
		final boolean trusted = mKeyguardDelegate.isTrusted();
		willDismiss = trusted && mKeyguardOccluded && mKeyguardDelegate != null
		&& mKeyguardDelegate.isShowing();
		if (mDismissKeyguard == DISMISS_KEYGUARD_START) {
		final boolean willDismiss = trusted && mKeyguardOccluded
		&& mKeyguardDelegate != null && mKeyguardDelegate.isShowing();
		if (willDismiss) {
		mCurrentlyDismissingKeyguard = true;
		}

		// Only launch the next keyguard unlock window once per window.
		mHandler.post(() -> mKeyguardDelegate.dismiss(
		trusted /* allowWhileOccluded */));
		dismissKeyguard = true;
		}

		// If we are currently dismissing Keyguard, there is no need to unocclude it.
		@@ -5315,6 +5312,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		\| FINISH_LAYOUT_REDO_WALLPAPER;
		}
		}

		if (dismissKeyguard) {
		// Only launch the next keyguard unlock window once per window.
		mHandler.post(() -> mKeyguardDelegate.dismiss(
		trusted /* allowWhileOccluded */));
		}
		} else {
		mWinDismissingKeyguard = null;
		mSecureDismissingKeyguard = false;