PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Michael Jurka
2013-10-23 18:39:18 +00:00
committed by Android (Google) Code Review
parent d9546fc66b 7c70d64d4c
commit 3d7f086f6a
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/LauncherAnimUtils.java
+5 -5
View File
@@ -25,12 +25,13 @@ import android.view.View;
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 class LauncherAnimUtils {
}
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);
}
}