OSDN Git Service

DO NOT MERGE: Fix leak when animations are created but never started
authorMichael Jurka <mikejurka@google.com>
Mon, 21 Oct 2013 22:57:08 +0000 (15:57 -0700)
committerWinson Chung <winsonc@google.com>
Tue, 22 Oct 2013 00:13:12 +0000 (00:13 +0000)
Bug: 11322014
(cherry picked from commit e206ff0f73e9821e7454810779f3f88d4a8deabb)

Change-Id: I5aaf76d7c96e4a7878946d7de337acd858c11f44

src/com/android/launcher3/LauncherAnimUtils.java

index 01f72a7..5d4f9c6 100644 (file)
@@ -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);
     }