summaryrefslogtreecommitdiffstats
path: root/services/java
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2013-11-04 19:32:08 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-11-04 19:32:08 +0000
commit351de3ccfdf09e6455d658fd083dc5d778d17add (patch)
tree8dde80e927f3e71363d354de52478f3b1a3d2642 /services/java
parent517220b4682d31e9ea515f28c3702324352bfcda (diff)
parentc78a06db286ced701e25c4a343d4c501e1755c2b (diff)
downloadframeworks_base-351de3ccfdf09e6455d658fd083dc5d778d17add.zip
frameworks_base-351de3ccfdf09e6455d658fd083dc5d778d17add.tar.gz
frameworks_base-351de3ccfdf09e6455d658fd083dc5d778d17add.tar.bz2
Merge "Layout hidden windows on Configuration change." into klp-dev
Diffstat (limited to 'services/java')
-rw-r--r--services/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 63e09db..a645c01 100644
--- a/services/java/com/android/server/wm/WindowManagerService.java
+++ b/services/java/com/android/server/wm/WindowManagerService.java
@@ -8269,7 +8269,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.mAttrs.type == TYPE_KEYGUARD && win.isConfigChanged())
+ || win.isConfigChanged()
|| win.mAttrs.type == TYPE_UNIVERSE_BACKGROUND) {
if (!win.mLayoutAttached) {
if (initial) {