diff options
author | Michael Jurka <mikejurka@google.com> | 2013-10-21 23:00:41 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-21 23:00:42 +0000 |
commit | 4edc931562d94422c90c0d3d80eb0f54ee79c73f (patch) | |
tree | 21798148fd9ce4ce8a0e0b93be621b62fb42d3d6 | |
parent | 862f7e395004b00d871cbe507fd5f2a70c797ef7 (diff) | |
parent | e206ff0f73e9821e7454810779f3f88d4a8deabb (diff) | |
download | android_packages_apps_Trebuchet-4edc931562d94422c90c0d3d80eb0f54ee79c73f.tar.gz android_packages_apps_Trebuchet-4edc931562d94422c90c0d3d80eb0f54ee79c73f.tar.bz2 android_packages_apps_Trebuchet-4edc931562d94422c90c0d3d80eb0f54ee79c73f.zip |
Merge "Fix leak when animations are created but never started" into jb-ub-now-jetsonic
-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); } |