Merge \\"Key the conference participants using the Endpoint\\" into nyc-mr1-dev am: d74916ea4b
am: 554ed40683
Change-Id: I81ae681d5ee6d63062fc2b3e03b21eb97e83f015
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);