commit 554ed40683b4cc3b41d54c5c1745c179f8b96715
author Brad Ebinger <breadley@google.com> Mon Jul 18 17:55:24 2016 +0000
committer android-build-merger <android-build-merger@google.com> Mon Jul 18 17:55:24 2016 +0000
tree 51ab41a3eb522f14b38396a3425366336c6ea6bf
parent 49f2a6eebf7f97ff3f56a1a33a87de43b903a338
parent d74916ea4b3919da404e36ff04d49838d7762442

Merge \"Key the conference participants using the Endpoint\" into nyc-mr1-dev
am: d74916ea4b

Change-Id: I8cbf5892c0e8df3562263b4022e584459bd23525

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 9698e0e..639cc03 100644
--- a/src/com/android/services/telephony/ImsConference.java
+++ b/src/com/android/services/telephony/ImsConference.java
@@ -622,7 +622,7 @@
 
             // Add any new participants and update existing.
             for (ConferenceParticipant participant : participants) {
-                Uri userEntity = participant.getHandle();
+                Uri userEntity = participant.getEndpoint();
 
                 participantUserEntities.add(userEntity);
                 if (!mConferenceParticipantConnections.containsKey(userEntity)) {
@@ -645,7 +645,7 @@
                 // Set the state of the new participants at once and add to the conference
                 for (ConferenceParticipant newParticipant : newParticipants) {
                     ConferenceParticipantConnection connection =
-                            mConferenceParticipantConnections.get(newParticipant.getHandle());
+                            mConferenceParticipantConnections.get(newParticipant.getEndpoint());
                     connection.updateState(newParticipant.getState());
                 }
             }
@@ -701,7 +701,7 @@
         }
 
         synchronized(mUpdateSyncRoot) {
-            mConferenceParticipantConnections.put(participant.getHandle(), connection);
+            mConferenceParticipantConnections.put(participant.getEndpoint(), connection);
         }
         mTelephonyConnectionService.addExistingConnection(mConferenceHostPhoneAccountHandle,
                 connection);