diff options
| author | Craig Mautner <cmautner@google.com> | 2015-04-21 15:41:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-21 15:41:26 +0000 |
| commit | c5e73bf9f8a3434571b407f0f1abd701a8e69131 (patch) | |
| tree | 91644ae9fc95bd3a71716759e62454669bf48343 /services | |
| parent | b201110437f6bcb0c96aa70bb5f17d8d8d0597d9 (diff) | |
| parent | da506ffabadd551241e23aecf08e378e7d0f30b1 (diff) | |
| download | frameworks_base-c5e73bf9f8a3434571b407f0f1abd701a8e69131.zip frameworks_base-c5e73bf9f8a3434571b407f0f1abd701a8e69131.tar.gz frameworks_base-c5e73bf9f8a3434571b407f0f1abd701a8e69131.tar.bz2 | |
am da506ffa: am 14818725: am 80f99121: Merge "Prevent infinite layout and wallpaper flashing"
* commit 'da506ffabadd551241e23aecf08e378e7d0f30b1':
Prevent infinite layout and wallpaper flashing
Diffstat (limited to 'services')
| -rw-r--r-- | services/core/java/com/android/server/policy/PhoneWindowManager.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index fce01e5..ad85b59 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -4215,8 +4215,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. |