b/2273942 Fixed iterator concurrent modification error.

Invalid addresses were being removed from a list while iterating through it, causing a
ConcurrentModificationException. Changed the loop to use an explicit iterator and do
removals through that iterator.

diff --git a/src/com/android/calendar/EditEvent.java b/src/com/android/calendar/EditEvent.java
index e907a6f..e9abe67 100644 (file)
--- a/src/com/android/calendar/EditEvent.java
+++ b/src/com/android/calendar/EditEvent.java
@@ -88,6 +88,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Calendar;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.TimeZone;
 
@@ -854,10 +855,12 @@ public class EditEvent extends Activity implements View.OnClickListener,
 
         // validate the emails, out of paranoia.  they should already be
         // validated on input, but drop any invalid emails just to be safe.
-        for (Rfc822Token address : addresses) {
+        Iterator<Rfc822Token> addressIterator = addresses.iterator();
+        while (addressIterator.hasNext()) {
+            Rfc822Token address = addressIterator.next();
             if (!mEmailValidator.isValid(address.getAddress())) {
                 Log.w(TAG, "Dropping invalid attendee email address: " + address);
-                addresses.remove(address);
+                addressIterator.remove();
             }
         }
         return addresses;