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

Author: Craig Mautner

services/java/com/android/server/wm/WindowManagerService.java

@@ -3639,8 +3639,6 @@ public void removeWindowToken(IBinder token) {
             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 void removeWindowToken(IBinder token) {
                         }
                     }
 
+                    wtoken.hidden = true;
+
                     if (changed) {
                         performLayoutAndPlaceSurfacesLocked();
                         updateFocusedWindowLocked(UPDATE_FOCUS_NORMAL,