Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix to handle duplicate call id for conference call" am: e31b09c825 am: 8d54779726

Browse Source 
Change-Id: Ia7ce47824a9610e28c7b333e3d6b4e7a73872fa9
This commit is contained in:
Automerger Merge Worker
2019-12-10 22:57:13 +00:00
parent 08135b313a 8d54779726
commit 5b07e901bf
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
telephony/java/android/telephony/ims/ImsCallSession.java
View File

@@ -1173,18 +1173,8 @@ public class ImsCallSession {
public void callSessionMergeComplete(IImsCallSession newSession) { public void callSessionMergeComplete(IImsCallSession newSession) {
if (mListener != null) { if (mListener != null) {
if (newSession != null) { if (newSession != null) {
// Check if the active session is the same session that was // New session created after conference
// active before the merge request was sent. mListener.callSessionMergeComplete(new ImsCallSession(newSession));
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);
} else { } else {
// Session already exists. Hence no need to pass // Session already exists. Hence no need to pass
mListener.callSessionMergeComplete(null); mListener.callSessionMergeComplete(null);