Merge "Delay setting hidden until after isVisibleNow test." into jb-mr1-dev

2012-10-02 19:13:59 -07:00
parent 720d14db87 4b5aa78c89
commit 3e2358a0e6
1 changed files with 2 additions and 2 deletions
--- a/services/java/com/android/server/wm/WindowManagerService.java
+++ b/services/java/com/android/server/wm/WindowManagerService.java
@@ -3639,8 +3639,6 @@ public class WindowManagerService extends IWindowManager.Stub
            if (wtoken != null) {
                boolean delayed = false;
                if (!wtoken.hidden) {
-                    wtoken.hidden = true;
-
                    final int N = wtoken.windows.size();
                    boolean changed = false;

@@ -3661,6 +3659,8 @@ public class WindowManagerService extends IWindowManager.Stub
                        }
                    }

+                    wtoken.hidden = true;
+
                    if (changed) {
                        performLayoutAndPlaceSurfacesLocked();
                        updateFocusedWindowLocked(UPDATE_FOCUS_NORMAL,