aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2017-05-14 07:19:38 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2017-05-14 07:19:38 +0000
commitf446f6b174358c1b0811a86631ecdc4548478889 (patch)
tree2785e2b11505977730943aefe2b8286933a864bc
parent32dad10ec8d826c70f3540e2d54b4c1b914238fa (diff)
parent96e2d85ef5300fdac5acf89daabfa2584f969d0d (diff)
downloadims-f446f6b174358c1b0811a86631ecdc4548478889.tar.gz
release-request-951b3a8b-6c0c-4d2e-8af4-1c3f7e209f66-for-git_oc-release-4006899 snap-temp-L39600000063784275
Change-Id: I834ecffa5dd60e048a5cab9479d8ba50ec434342
-rw-r--r--src/java/com/android/ims/ImsCall.java5
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 a6d0a0cc..b6370de0 100644
--- a/src/java/com/android/ims/ImsCall.java
+++ b/src/java/com/android/ims/ImsCall.java
@@ -1795,13 +1795,16 @@ public class ImsCall implements ICall {
setIsMerged(playDisconnectTone);
mSessionEndDuringMerge = true;
String reasonInfo;
+ int reasonCode = ImsReasonInfo.CODE_UNSPECIFIED;
if (playDisconnectTone) {
+ reasonCode = ImsReasonInfo.CODE_USER_TERMINATED_BY_REMOTE;
reasonInfo = "Call ended by network";
} else {
+ reasonCode = ImsReasonInfo.CODE_LOCAL_ENDED_BY_CONFERENCE_MERGE;
reasonInfo = "Call ended during conference merge process.";
}
mSessionEndDuringMergeReasonInfo = new ImsReasonInfo(
- ImsReasonInfo.CODE_UNSPECIFIED, 0, reasonInfo);
+ reasonCode, 0, reasonInfo);
}
}