Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am da506ffa: am 14818725: am 80f99121: Merge "Prevent infinite layout and wallpaper flashing"

Browse Source 
* commit 'da506ffabadd551241e23aecf08e378e7d0f30b1':
  Prevent infinite layout and wallpaper flashing
This commit is contained in:
Craig Mautner
2015-04-21 15:41:26 +00:00
committed by Android Git Automerger
parent b201110437 da506ffaba
commit c5e73bf9f8
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/policy/PhoneWindowManager.java
View File

@@ -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.