Merge "Fix endless looping in layout."

2012-04-06 18:14:15 -07:00
parent b7943811a2 3de422fe4f
commit cd837070f6
1 changed files with 1 additions and 1 deletions
--- 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;
        }