Merge "Fixing concurrent modification exception. (Bug 6807320)"
diff --git a/src/com/android/launcher2/LauncherAnimUtils.java b/src/com/android/launcher2/LauncherAnimUtils.java
index 8a4633e..74fde48 100644
--- a/src/com/android/launcher2/LauncherAnimUtils.java
+++ b/src/com/android/launcher2/LauncherAnimUtils.java
@@ -48,7 +48,8 @@
}
public static void onDestroyActivity() {
- for (Animator a : sAnimators) {
+ HashSet<Animator> animators = new HashSet<Animator>(sAnimators);
+ for (Animator a : animators) {
if (a.isRunning()) {
a.cancel();
}