Merge "Fix to handle duplicate call id for conference call" into q-ke…

…ystone-qcom-dev
AOSP-10-CAF · Oct 10, 2019 · ef95607 · ef95607
2 parents 86397c8 + 18a36d5
commit ef95607
Showing 1 changed file with 2 additions and 11 deletions.
diff --git a/telephony/java/android/telephony/ims/ImsCallSession.java b/telephony/java/android/telephony/ims/ImsCallSession.java
@@ -1173,17 +1173,8 @@ public void callSessionMergeStarted(IImsCallSession newSession, ImsCallProfile p
         public void callSessionMergeComplete(IImsCallSession newSession) {
             if (mListener != null) {
                 if (newSession != null) {
-                    // Check if the active session is the same session that was
-                    // active before the merge request was sent.
-                    ImsCallSession validActiveSession = ImsCallSession.this;
-                    try {
-                        if (!Objects.equals(miSession.getCallId(), newSession.getCallId())) {
-                            // New session created after conference
-                            validActiveSession = new ImsCallSession(newSession);
-                        }
-                    } catch (RemoteException rex) {
-                        Log.e(TAG, "callSessionMergeComplete: exception for getCallId!");
-                    }
+                    // New session created after conference
+                    ImsCallSession validActiveSession = new ImsCallSession(newSession);
                     mListener.callSessionMergeComplete(validActiveSession);
                } else {
                    // Session already exists. Hence no need to pass