am c9d0ee5e: Merge "Tweak test for layout." into klp-dev

* commit 'c9d0ee5e8476bbe0d50b726f9cb4cf173d6f6952': Tweak test for layout.
2013-11-06 15:26:45 -08:00
parent 8ed10cff78 c9d0ee5e84
commit ea18624ae5
1 changed files with 2 additions and 1 deletions
--- a/services/java/com/android/server/wm/WindowManagerService.java
+++ b/services/java/com/android/server/wm/WindowManagerService.java
@@ -8269,7 +8269,8 @@ 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()
+                    || mOpeningApps.contains(win.mAppToken)
                    || win.mAttrs.type == TYPE_UNIVERSE_BACKGROUND) {
                if (!win.mLayoutAttached) {
                    if (initial) {