diff options
| author | Craig Mautner <cmautner@google.com> | 2015-04-21 15:30:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-04-21 15:30:44 +0000 |
| commit | da506ffabadd551241e23aecf08e378e7d0f30b1 (patch) | |
| tree | 85fda89d464f5395bc7f25034adb66852a389fb4 | |
| parent | 3bbd87dd1f6b7f6b767885a56ad062897bb25642 (diff) | |
| parent | 148187255ecaaaf6a35920f779fa6a171433ccd4 (diff) | |
| download | frameworks_base-da506ffabadd551241e23aecf08e378e7d0f30b1.zip frameworks_base-da506ffabadd551241e23aecf08e378e7d0f30b1.tar.gz frameworks_base-da506ffabadd551241e23aecf08e378e7d0f30b1.tar.bz2 | |
am 14818725: am 80f99121: Merge "Prevent infinite layout and wallpaper flashing"
* commit '148187255ecaaaf6a35920f779fa6a171433ccd4':
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 1ca772f..ecbdcb7 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -4225,8 +4225,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. |