commit cf8cbbe77447d9cca28e789c5ec4e714694ab37d
author Craig Mautner <cmautner@google.com> Sun Mar 25 21:54:36 2012 -0700
committer Craig Mautner <cmautner@google.com> Sun Mar 25 21:54:36 2012 -0700
tree e9fc2869f14129ab391caaea75ab6d1f179b52d9
parent 2cd24ecf61e374d8b9feafec78ccefb5d3ae647e

Skip layout if performShow fails.

In cases where a Surface does not go from hidden to shown, do not set
the perform layout flag. This keeps us out of repeated passes through
the layout code.

Fixes bug 6222487.

Change-Id: I22601bef5733d2f996a8cbdd50d6b89517bc3122

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

diff --git a/services/java/com/android/server/wm/AppWindowToken.java b/services/java/com/android/server/wm/AppWindowToken.java
index c29ef3f..1442883 100644
--- a/services/java/com/android/server/wm/AppWindowToken.java
+++ b/services/java/com/android/server/wm/AppWindowToken.java
@@ -336,6 +336,10 @@
         }
 
         service.mPendingLayoutChanges |= WindowManagerPolicy.FINISH_LAYOUT_REDO_ANIM;
+        if (WindowManagerService.DEBUG_LAYOUT_REPEATS) {
+            service.debugLayoutRepeats("AppWindowToken");
+        }
+
         clearAnimation();
         animating = false;
         if (animLayerAdjustment != 0) {