diff options
| author | Adam Cohen <adamcohen@google.com> | 2013-10-22 00:25:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-22 00:25:08 +0000 |
| commit | 4d3f022c9a7170dd4b069ee71534f1baf30cb2f4 (patch) | |
| tree | 1cbedd5e1e754ec7fd6a6796693bebe556c6288e /src/com/android | |
| parent | a78b25f89de49b68a6dd7ddef5aaefe7919f3698 (diff) | |
| parent | 7e839ec8f6545f930304f4f5307ced0b35e7590d (diff) | |
| download | android_packages_apps_Trebuchet-4d3f022c9a7170dd4b069ee71534f1baf30cb2f4.tar.gz android_packages_apps_Trebuchet-4d3f022c9a7170dd4b069ee71534f1baf30cb2f4.tar.bz2 android_packages_apps_Trebuchet-4d3f022c9a7170dd4b069ee71534f1baf30cb2f4.zip | |
Merge "DO NOT MERGE: Fix leak when animations are created but never started" into jb-ub-now-indigo-rose
Diffstat (limited to 'src/com/android')
| -rw-r--r-- | src/com/android/launcher3/LauncherAnimUtils.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/launcher3/LauncherAnimUtils.java b/src/com/android/launcher3/LauncherAnimUtils.java index 01f72a7ce..5d4f9c67e 100644 --- a/src/com/android/launcher3/LauncherAnimUtils.java +++ b/src/com/android/launcher3/LauncherAnimUtils.java @@ -30,6 +30,7 @@ public class LauncherAnimUtils { static HashSet<Animator> sAnimators = new HashSet<Animator>(); static Animator.AnimatorListener sEndAnimListener = new Animator.AnimatorListener() { public void onAnimationStart(Animator animation) { + sAnimators.add(animation); } public void onAnimationRepeat(Animator animation) { @@ -45,7 +46,6 @@ public class LauncherAnimUtils { }; public static void cancelOnDestroyActivity(Animator a) { - sAnimators.add(a); a.addListener(sEndAnimListener); } |