commit 6e05f74383b17366cd08a9d3ebc5a89e19c41b32
author Amit Mahajan <amitmahajan@google.com> Thu Jul 21 21:52:40 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 21 21:52:41 2016 +0000
tree e63b384a18668b82dfa015d416fefcaf6d1909d0
parent 864db7828aa20e65dd8f2d52fbb3c0eaa4c7bffa
parent bfd94d19dd2bfa5df94f4455d4f5736173316fba

Merge "In IMS conference, use participants' Handle to check if it's host." into nyc-mr1-dev

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 b911105..2654ad7 100644
--- a/src/com/android/services/telephony/ImsConference.java
+++ b/src/com/android/services/telephony/ImsConference.java
@@ -647,7 +647,7 @@
                 if (!mConferenceParticipantConnections.containsKey(userEntity)) {
                     // Some carriers will also include the conference host in the CEP.  We will
                     // filter that out here.
-                    if (!isParticipantHost(mConferenceHostAddress, userEntity)) {
+                    if (!isParticipantHost(mConferenceHostAddress, participant.getHandle())) {
                         createConferenceParticipantConnection(parent, participant);
                         newParticipants.add(participant);
                         newParticipantsAdded = true;