Commit 14077be0 authored by Anju Mathapati's avatar Anju Mathapati Committed by Anthony Lee
Browse files

IMS: Dont clean merge info on host termination

When merge is initiated & user triggers hangup
we should process hangup only for the active call.
Peer session updates will automatically happen after
conference response.
Peer information should not be cleaned up from active call

Change-Id: I0213e434f30e705c2f23ac2fb0c127b015da56da
BUG=24410640
parent d0fb6640
......@@ -1668,9 +1668,6 @@ public class ImsCall implements ICall {
mSessionEndDuringMerge = true;
mSessionEndDuringMergeReasonInfo = reasonInfo;
return;
} else if (mTerminationRequestPending) {
// Abort the merge if we receive a termination request from telephony or the user.
clearMergeInfo();
}
// If we are terminating the conference call, notify using conference listeners.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment