commit 80f99121ea96cdabea6260ab165e7183431be513
author Craig Mautner <cmautner@google.com> Tue Apr 21 14:54:42 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Apr 21 14:54:44 2015 +0000
tree f624bc11f35740ad576d47be6fb0b541b23902cf
parent b6feabcfce080c2dc906434cf05ff606489cf39d
parent 517129cfa4cbbe21c5b391520cbf24fd53044781

Merge "Prevent infinite layout and wallpaper flashing"

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

diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
index 69a4ac0..af5025b 100644
--- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
+++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
@@ -4120,8 +4120,9 @@
     /** {@inheritDoc} */
     @Override
     public int finishPostLayoutPolicyLw() {
-        if (mWinShowWhenLocked != null &&
-                mWinShowWhenLocked != mTopFullscreenOpaqueWindowState) {
+        if (mWinShowWhenLocked != null && mTopFullscreenOpaqueWindowState != null &&
+                mWinShowWhenLocked.getAppToken() != mTopFullscreenOpaqueWindowState.getAppToken()
+                && isKeyguardLocked()) {
             // A dialog is dismissing the keyguard. Put the wallpaper behind it and hide the
             // fullscreen window.
             // TODO: Make sure FLAG_SHOW_WALLPAPER is restored when dialog is dismissed. Or not.