1 files changed, 6 insertions, 2 deletions
diff --git a/telecomm/java/android/telecomm/ConnectionServiceAdapter.java b/telecomm/java/android/telecomm/ConnectionServiceAdapter.java
index b60e7c6..f71544b 100644
--- a/telecomm/java/android/telecomm/ConnectionServiceAdapter.java
+++ b/telecomm/java/android/telecomm/ConnectionServiceAdapter.java
@@ -28,6 +28,7 @@ import com.android.internal.telecomm.RemoteServiceCallback;
 
 import java.util.ArrayList;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
@@ -61,9 +62,12 @@ final class ConnectionServiceAdapter implements DeathRecipient {
     /** ${inheritDoc} */
     @Override
     public void binderDied() {
-        for (IConnectionServiceAdapter adapter : mAdapters) {
+        Iterator<IConnectionServiceAdapter> it = mAdapters.iterator();
+        while (it.hasNext()) {
+            IConnectionServiceAdapter adapter = it.next();
             if (!adapter.asBinder().isBinderAlive()) {
-                removeAdapter(adapter);
+                it.remove();
+                adapter.asBinder().unlinkToDeath(this, 0);
             }
         }
     }