summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2012-07-12 13:42:16 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-07-12 13:42:16 -0700
commitaae6989332f87c48dbc30a0f4e51cf70ddd2fd6f (patch)
tree037ba9abc66304c69d27b1d762816c98a99401d6 /src
parente2e35873dd7d3da92766f60883d42994046602e2 (diff)
parent15ba53a54c8b319e3ccdffa586fab1cfcd8971e5 (diff)
downloadandroid_packages_apps_Trebuchet-aae6989332f87c48dbc30a0f4e51cf70ddd2fd6f.tar.gz
android_packages_apps_Trebuchet-aae6989332f87c48dbc30a0f4e51cf70ddd2fd6f.tar.bz2
android_packages_apps_Trebuchet-aae6989332f87c48dbc30a0f4e51cf70ddd2fd6f.zip
Merge "Fixing concurrent modification exception. (Bug 6807320)"
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher2/LauncherAnimUtils.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher2/LauncherAnimUtils.java b/src/com/android/launcher2/LauncherAnimUtils.java
index 8a4633e85..74fde48b4 100644
--- a/src/com/android/launcher2/LauncherAnimUtils.java
+++ b/src/com/android/launcher2/LauncherAnimUtils.java
@@ -48,7 +48,8 @@ public class LauncherAnimUtils {
}
public static void onDestroyActivity() {
- for (Animator a : sAnimators) {
+ HashSet<Animator> animators = new HashSet<Animator>(sAnimators);
+ for (Animator a : animators) {
if (a.isRunning()) {
a.cancel();
}