summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Chet Haase <chet@google.com> 2012-10-30 17:45:55 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2012-10-30 17:45:55 -0700
commit2e6a65ca8f73083b6f1dcbd07e10af859affde78 (patch)
treee4cde9f56bf33611119fe8656bf266b84916a5c3
parent77007ac6a4876c735125593d7d23dcbdd641787b (diff)
parent27f752eb1d5c0f92fb38e7d6d0ea20b3b3b26a02 (diff)
am 27f752eb: Merge "WindowManager shouldn\'t layout non-visible windows" into jb-mr1-dev
* commit '27f752eb1d5c0f92fb38e7d6d0ea20b3b3b26a02': WindowManager shouldn't layout non-visible windows
-rwxr-xr-xservices/java/com/android/server/wm/WindowManagerService.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/services/java/com/android/server/wm/WindowManagerService.java b/services/java/com/android/server/wm/WindowManagerService.java
index 637f2de086e5..3532c0c9d992 100755
--- a/services/java/com/android/server/wm/WindowManagerService.java
+++ b/services/java/com/android/server/wm/WindowManagerService.java
@@ -8379,7 +8379,7 @@ public class WindowManagerService extends IWindowManager.Stub
// windows, since that means "perform layout as normal,
// just don't display").
if (!gone || !win.mHaveFrame || win.mLayoutNeeded
- || win.isConfigChanged()
+ || (win.mAttrs.type == TYPE_KEYGUARD && win.isConfigChanged())
|| win.mAttrs.type == TYPE_UNIVERSE_BACKGROUND) {
if (!win.mLayoutAttached) {
if (initial) {