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"

Browse Source 
am: e31b09c825

Change-Id: I4c9812fcde1a73389e3ded89280e9084ec83aaf7
This commit is contained in:
Ravi Paluri
2019-12-10 14:39:01 -08:00
committed by android-build-merger
parent 2dcd338a46 e31b09c825
commit 8d54779726
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) {
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);