Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8951d29c authored by Ravi Paluri's avatar Ravi Paluri Committed by android-build-merger
Browse files

Merge "Fix to handle duplicate call id for conference call"

am: 440a705b

Change-Id: I4088108e14bcea849727f8cdeb7c13ecb8b50107
parents 40389888 440a705b
Loading
Loading
Loading
Loading
+1 −13
Original line number Diff line number Diff line
@@ -2653,17 +2653,6 @@ public class ImsCall implements ICall {
            return;
        }

        /*
         * This method check if session exists as a session on the current
         * ImsCall or its counterpart if it is in the process of a conference
         */
        private boolean doesCallSessionExistsInMerge(ImsCallSession cs) {
            String callId = cs.getCallId();
            return ((isMergeHost() && Objects.equals(mMergePeer.mSession.getCallId(), callId)) ||
                    (isMergePeer() && Objects.equals(mMergeHost.mSession.getCallId(), callId)) ||
                    Objects.equals(mSession.getCallId(), callId));
        }

        /**
         * We received a callback from ImsCallSession that merge completed.
         * @param newSession - this session can have 2 values based on the below scenarios
@@ -2697,8 +2686,7 @@ public class ImsCall implements ICall {
            } else {
                // Handles case 1, 2, 3
                if (newSession != null) {
                    mTransientConferenceSession = doesCallSessionExistsInMerge(newSession) ?
                            null: newSession;
                    mTransientConferenceSession = newSession;
                }
                // Handles case 5
                processMergeComplete();