Transfer participants during 3 way conference

When active call fails to merge & only held call
merges into conference, pass the participants
from active to held call which is now going to
be the active conference call.

Change-Id: I0f9ec11b92b48e8796daff8989f8af1f05548f37
CRs-Fixed: 880999

1 files changed, 5 insertions, 1 deletions

diff --git a/src/java/com/android/ims/ImsCall.java b/src/java/com/android/ims/ImsCall.java
index afbb196..9938fe5 100644
--- a/src/java/com/android/ims/ImsCall.java
+++ b/src/java/com/android/ims/ImsCall.java
@@ -1838,6 +1838,9 @@ public class ImsCall implements ICall {
                     // brought up.
                     mMergePeer.mHold = false;
                     this.mHold = true;
+                    if (mConferenceParticipants != null && !mConferenceParticipants.isEmpty()) {
+                        mMergePeer.mConferenceParticipants = mConferenceParticipants;
+                    }
                     finalHostCall = mMergePeer;
                     finalPeerCall = this;
                     swapRequired = true;
@@ -1914,7 +1917,8 @@ public class ImsCall implements ICall {
             }
             if (mConferenceParticipants != null && !mConferenceParticipants.isEmpty()) {
                 try {
-                    listener.onConferenceParticipantsStateChanged(this, mConferenceParticipants);
+                    listener.onConferenceParticipantsStateChanged(finalHostCall,
+                            mConferenceParticipants);
                 } catch (Throwable t) {
                     loge("processMergeComplete :: ", t);
                 }