am 413c4ba7: am dc9e13b3: Merge "Perform all layouts within first loop." into jb-mr1-dev

* commit '413c4ba7d46aaaa59de06a75493096d9ce5a6e1b': Perform all layouts within first loop.
2012-10-16 13:52:33 -07:00
parent 8bb6b77d79 413c4ba7d4
commit b15238dc75
1 changed files with 9 additions and 1 deletions
--- a/services/java/com/android/server/wm/WindowManagerService.java
+++ b/services/java/com/android/server/wm/WindowManagerService.java
@@ -8117,8 +8117,16 @@ public class WindowManagerService extends IWindowManager.Stub
        }
    }

-    private boolean mInLayout = false;
    private final void performLayoutAndPlaceSurfacesLocked() {
+        do {
+            mTraversalScheduled = false;
+            performLayoutAndPlaceSurfacesLockedLoop();
+            mH.removeMessages(H.DO_TRAVERSAL);
+        } while (mTraversalScheduled);
+    }
+
+    private boolean mInLayout = false;
+    private final void performLayoutAndPlaceSurfacesLockedLoop() {
        if (mInLayout) {
            if (DEBUG) {
                throw new RuntimeException("Recursive call!");