summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorMichael Jurka <mikejurka@google.com>2013-10-21 15:57:08 -0700
committerWinson Chung <winsonc@google.com>2013-10-22 00:13:12 +0000
commit7e839ec8f6545f930304f4f5307ced0b35e7590d (patch)
tree42600bef443185d57ed0ab19d6d56fe46b69d2d2 /src/com/android
parent6811c5a414a15fa34b4f6917c3f250b3498a89ed (diff)
downloadandroid_packages_apps_Trebuchet-7e839ec8f6545f930304f4f5307ced0b35e7590d.tar.gz
android_packages_apps_Trebuchet-7e839ec8f6545f930304f4f5307ced0b35e7590d.tar.bz2
android_packages_apps_Trebuchet-7e839ec8f6545f930304f4f5307ced0b35e7590d.zip
DO NOT MERGE: Fix leak when animations are created but never started
Bug: 11322014 (cherry picked from commit e206ff0f73e9821e7454810779f3f88d4a8deabb) Change-Id: I5aaf76d7c96e4a7878946d7de337acd858c11f44
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/launcher3/LauncherAnimUtils.java2
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);
}