diff options
| author | 2015-04-21 14:54:42 +0000 | |
|---|---|---|
| committer | 2015-04-21 14:54:44 +0000 | |
| commit | 80f99121ea96cdabea6260ab165e7183431be513 (patch) | |
| tree | f624bc11f35740ad576d47be6fb0b541b23902cf | |
| parent | b6feabcfce080c2dc906434cf05ff606489cf39d (diff) | |
| parent | 517129cfa4cbbe21c5b391520cbf24fd53044781 (diff) | |
Merge "Prevent infinite layout and wallpaper flashing"
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 69a4ac02a058..af5025b8d151 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 @@ public class PhoneWindowManager implements WindowManagerPolicy { /** {@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. |