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

* commit 'e60f8ce1c9c3db51ba0997210b2cd073da68ae81': Delay setting hidden until after isVisibleNow test.
2012-10-02 19:18:46 -07:00
parent bba79225c9 e60f8ce1c9
commit d23b3e579d
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,