Merge "Fix ConcurrentModificationException in NFC Unlock" into lmp-dev

1 files changed, 5 insertions, 2 deletions

diff --git a/src/com/android/nfc/NfcUnlockManager.java b/src/com/android/nfc/NfcUnlockManager.java
index d2029392..20471302 100644
--- a/src/com/android/nfc/NfcUnlockManager.java
+++ b/src/com/android/nfc/NfcUnlockManager.java
@@ -7,6 +7,7 @@ import android.os.RemoteException;
 import android.util.Log;
 
 import java.util.HashMap;
+import java.util.Iterator;
 
 /**
  * Singleton for handling NFC Unlock related logic and state.
@@ -53,15 +54,17 @@ class NfcUnlockManager {
     }
 
     synchronized boolean tryUnlock(Tag tag) {
-        for (IBinder binder : mUnlockHandlers.keySet()) {
+        Iterator<IBinder> iterator = mUnlockHandlers.keySet().iterator();
+        while (iterator.hasNext()) {
             try {
+                IBinder binder = iterator.next();
                 UnlockHandlerWrapper handlerWrapper = mUnlockHandlers.get(binder);
                 if (handlerWrapper.mUnlockHandler.onUnlockAttempted(tag)) {
                     return true;
                 }
             } catch (RemoteException e) {
                 Log.e(TAG, "failed to communicate with unlock handler, removing", e);
-                mUnlockHandlers.remove(binder);
+                iterator.remove();
                 mLockscreenPollMask = recomputePollMask();
             }
         }