commit 1169c96e16e6175059d74e426fa63ae6bfafec1e
author Andreas Gampe <agampe@google.com> Thu Mar 01 16:13:43 2018 -0800
committer Andreas Gampe <agampe@google.com> Fri Mar 02 12:29:54 2018 -0800
tree d7e65316829aac5d84f8d4225db1abff0871cdaf
parent 682500aa42c1c956f79d84c16cf89fef230e007b

Telephony: Fix CollectionIncompatibleType

Ensure the key type is correct.

Found by Errorprone.

Bug: 73288226
Test: atest TeleServiceTests
Change-Id: I828ca78658d01ed2b86966c2f0989f24941685ca

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 3cf420a..dd74d28 100644
--- a/src/com/android/services/telephony/ImsConference.java
+++ b/src/com/android/services/telephony/ImsConference.java
@@ -758,7 +758,8 @@
 
         participant.removeConnectionListener(mParticipantListener);
         synchronized(mUpdateSyncRoot) {
-            mConferenceParticipantConnections.remove(participant.getUserEntity());
+            mConferenceParticipantConnections.remove(new Pair<>(participant.getUserEntity(),
+                    participant.getEndpoint()));
         }
         mTelephonyConnectionService.removeConnection(participant);
     }