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

* commit 'ea18624ae557a06e49748964f951a81fd6c48370': Tweak test for layout.
2013-11-06 15:30:23 -08:00
parent a2dad41e75 ea18624ae5
commit e5bdd85a99
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) {