Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5a9fd59 authored by Martijn Coenen's avatar Martijn Coenen Committed by Android (Google) Code Review
Browse files

Merge "Fix ConcurrentModificationException in AnimatorSet."

parents 245989df d45204ba

core/java/android/animation/AnimatorSet.java

+5 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.animation; 
import java.util.ArrayList;

import java.util.Collection;

import java.util.HashMap;

import java.util.Iterator;

import java.util.List;



/**
@@ -445,7 +446,10 @@ public final class AnimatorSet extends Animator { 
            // First, clear out the old listeners

            ArrayList<AnimatorListener> oldListeners = node.animation.getListeners();

            if (oldListeners != null && oldListeners.size() > 0) {

                for (AnimatorListener listener : oldListeners) {

                final ArrayList<AnimatorListener> clonedListeners = new

                        ArrayList<AnimatorListener>(oldListeners);



                for (AnimatorListener listener : clonedListeners) {

                    if (listener instanceof DependencyListener ||

                            listener instanceof AnimatorSetListener) {

                        node.animation.removeListener(listener);