diff options
| -rw-r--r-- | telephony/java/android/telephony/ims/ImsCallSession.java | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/telephony/java/android/telephony/ims/ImsCallSession.java b/telephony/java/android/telephony/ims/ImsCallSession.java index 47c468121484..5adc99e11478 100644 --- a/telephony/java/android/telephony/ims/ImsCallSession.java +++ b/telephony/java/android/telephony/ims/ImsCallSession.java @@ -1173,18 +1173,8 @@ public class ImsCallSession { 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!"); - } - mListener.callSessionMergeComplete(validActiveSession); + // New session created after conference + mListener.callSessionMergeComplete(new ImsCallSession(newSession)); } else { // Session already exists. Hence no need to pass mListener.callSessionMergeComplete(null); |