diff options
| author | Craig Mautner <cmautner@google.com> | 2012-04-06 18:04:13 -0700 |
|---|---|---|
| committer | Craig Mautner <cmautner@google.com> | 2012-04-06 18:04:13 -0700 |
| commit | 3de422fe4fe903b1370f3f7ee9c7086966e15b28 (patch) | |
| tree | 93d79a5d3ba08dce05a92ba20cb0c202cb7a0e65 /services | |
| parent | 1ade5ae9c812464f086f2151069781db1b27db2f (diff) | |
| download | frameworks_base-3de422fe4fe903b1370f3f7ee9c7086966e15b28.zip frameworks_base-3de422fe4fe903b1370f3f7ee9c7086966e15b28.tar.gz frameworks_base-3de422fe4fe903b1370f3f7ee9c7086966e15b28.tar.bz2 | |
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
Diffstat (limited to 'services')
| -rw-r--r-- | services/java/com/android/server/wm/AppWindowAnimator.java | 2 |
1 files changed, 1 insertions, 1 deletions
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; } |