diff options
| author | Benergy Meenan Ravuri <bravuri@codeaurora.org> | 2016-03-22 23:51:02 +0530 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-05-19 18:05:39 -0700 |
| commit | adbcc1db161da32f97de4eba11e51ff62f605ee6 (patch) | |
| tree | a67e6763f61ee1d2f7df3ee4ebac37dd906d0425 | |
| parent | 4f428809ee166eaae31bdca6e75e7ab018549c8c (diff) | |
| download | android_frameworks_opt_net_ims-cm-13.0.tar.gz android_frameworks_opt_net_ims-cm-13.0.tar.bz2 android_frameworks_opt_net_ims-cm-13.0.zip | |
IMS: Set the correct reason code for merged callHEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001stable/cm-13.0-ZNH5Ycm-13.0
Ensure correct call end reason is set for the call
merged to the conference
Change-Id: Ia02f5599b047914c3d591e1663ac614a6c76239d
CRs-Fixed: 985533
| -rw-r--r-- | src/java/com/android/ims/ImsCall.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/java/com/android/ims/ImsCall.java b/src/java/com/android/ims/ImsCall.java index 4e468fb..9d4aac6 100644 --- a/src/java/com/android/ims/ImsCall.java +++ b/src/java/com/android/ims/ImsCall.java @@ -1724,13 +1724,15 @@ public class ImsCall implements ICall { setIsMerged(playDisconnectTone); mSessionEndDuringMerge = true; String reasonInfo; + int reasonCode = ImsReasonInfo.CODE_UNSPECIFIED; if (playDisconnectTone) { reasonInfo = "Call ended by network"; } else { reasonInfo = "Call ended during conference merge process."; + reasonCode = ImsReasonInfo.CODE_USER_TERMINATED_BY_REMOTE; } mSessionEndDuringMergeReasonInfo = new ImsReasonInfo( - ImsReasonInfo.CODE_UNSPECIFIED, 0, reasonInfo); + reasonCode, 0, reasonInfo); } } @@ -1800,6 +1802,7 @@ public class ImsCall implements ICall { swapRequired = true; } mMergePeer.markCallAsMerged(false); + mMergePeer.setIsMerged(true); finalHostCall = this; finalPeerCall = mMergePeer; } else { |