am d23b3e57: am e60f8ce1: am 3e2358a0: Merge "Delay setting hidden until after isVisibleNow test." into jb-mr1-dev

* commit 'd23b3e579d0e8aceeed5e35c551641e083fc923a': Delay setting hidden until after isVisibleNow test.
2012-10-02 19:21:07 -07:00
parent b1916a4bc1 d23b3e579d
commit 222c91696a
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,