commit 3d7f086f6a6eb730dbd8d5e8874ce7a71a7a8194
author Michael Jurka <mikejurka@google.com> Wed Oct 23 18:39:18 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 23 18:39:18 2013 +0000
tree f3a3e530c593d59ab2fe06eb1b22ed657307a25c
parent d9546fc66b9492ef0c10d2baf2fed0260b85b64c
parent 7c70d64d4c814e3d48b69aa4d9daf0717d71bff5

Merge "Prevent memory leaks coming from LauncherAnimUtils" into jb-ub-now-jetsonic

src/com/android/launcher3/LauncherAnimUtils.java

diff --git a/src/com/android/launcher3/LauncherAnimUtils.java b/src/com/android/launcher3/LauncherAnimUtils.java
index 5d4f9c6..e6c220b 100644
--- a/src/com/android/launcher3/LauncherAnimUtils.java
+++ b/src/com/android/launcher3/LauncherAnimUtils.java
@@ -25,12 +25,13 @@
 import android.view.ViewTreeObserver;
 
 import java.util.HashSet;
+import java.util.WeakHashMap;
 
 public class LauncherAnimUtils {
-    static HashSet<Animator> sAnimators = new HashSet<Animator>();
+    static WeakHashMap<Animator, Object> sAnimators = new WeakHashMap<Animator, Object>();
     static Animator.AnimatorListener sEndAnimListener = new Animator.AnimatorListener() {
         public void onAnimationStart(Animator animation) {
-            sAnimators.add(animation);
+            sAnimators.put(animation, null);
         }
 
         public void onAnimationRepeat(Animator animation) {
@@ -74,13 +75,12 @@
     }
 
     public static void onDestroyActivity() {
-        HashSet<Animator> animators = new HashSet<Animator>(sAnimators);
+        HashSet<Animator> animators = new HashSet<Animator>(sAnimators.keySet());
         for (Animator a : animators) {
             if (a.isRunning()) {
                 a.cancel();
-            } else {
-                sAnimators.remove(a);
             }
+            sAnimators.remove(a);
         }
     }