commit d5b1158c2bd21e10f73c29462a277feee768c874
author Tyler Gunn <tgunn@google.com> Mon Dec 09 09:45:11 2019 -0800
committer android-build-merger <android-build-merger@google.com> Mon Dec 09 09:45:11 2019 -0800
tree 899faab0239d27caca8ac361b4186a61e7f87abb
parent 4c9dc4e0871075632d719be5459b9a31d56c427e
parent 6ce3914adb296aeb3bd1562d7318783faa6d9db9

Merge "Cleanup connection destruction to avoid ConcurrentModificationException." am: d675d5c150 am: 7952e82602
am: 6ce3914adb

Change-Id: I57860c6fcecf38f0f25f27c533f78b93c2b5f810

src/com/android/services/telephony/ImsConference.java

diff --git a/src/com/android/services/telephony/ImsConference.java b/src/com/android/services/telephony/ImsConference.java
index b47adb2..4c3f9c9 100644
--- a/src/com/android/services/telephony/ImsConference.java
+++ b/src/com/android/services/telephony/ImsConference.java
@@ -1030,9 +1030,9 @@
                 // call log.
                 connection.setDisconnected(new DisconnectCause(DisconnectCause.CANCELED));
                 connection.destroy();
-                handleConnectionDestruction(connection);
             }
             mConferenceParticipantConnections.clear();
+            updateManageConference();
         }
     }