From 3de422fe4fe903b1370f3f7ee9c7086966e15b28 Mon Sep 17 00:00:00 2001 From: Craig Mautner Date: Fri, 6 Apr 2012 18:04:13 -0700 Subject: Fix endless looping in layout. An odd alignment of the stars can end up with all of mAppToken.allDrawn animating and mAppToken.startingDisplayed all false, and animation not null. In such a case we can continue returning false but still pass the test in WindowAnimator.updateWindowsAndRotation setting wasAnimating to true. The combination continually sets the FINISH_LAYOUT_REDO_WALLPAPER bit in mPendingLayoutChanges. Fixes bug 6304838. Change-Id: Ie7a7b39ea218213f51dc3df3eefe4ff03f1d885d --- services/java/com/android/server/wm/AppWindowAnimator.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'services') diff --git a/services/java/com/android/server/wm/AppWindowAnimator.java b/services/java/com/android/server/wm/AppWindowAnimator.java index 003dc17..c3b5465 100644 --- a/services/java/com/android/server/wm/AppWindowAnimator.java +++ b/services/java/com/android/server/wm/AppWindowAnimator.java @@ -224,7 +224,7 @@ public class AppWindowAnimator { hasTransformation = false; - if (!animating) { + if (!animating && animation == null) { return false; } -- cgit v1.1