diff options
| author | Craig Mautner <cmautner@google.com> | 2012-04-06 18:14:15 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-04-06 18:14:15 -0700 |
| commit | cd837070f64a7dffb5e78b37763da63c01600ebf (patch) | |
| tree | befba876fd93e9a51874a98a9ba43a49ae8485ac /services | |
| parent | b7943811a2dbe602f21b2cce0bfb0458042191b0 (diff) | |
| parent | 3de422fe4fe903b1370f3f7ee9c7086966e15b28 (diff) | |
| download | frameworks_base-cd837070f64a7dffb5e78b37763da63c01600ebf.zip frameworks_base-cd837070f64a7dffb5e78b37763da63c01600ebf.tar.gz frameworks_base-cd837070f64a7dffb5e78b37763da63c01600ebf.tar.bz2 | |
Merge "Fix endless looping in layout."
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; } |