commit 5ba29530ac569fd08d1f71604cba128afcd7c0db
author Jayachandran Chinnakkannu <jayachandranc@google.com> Sat May 13 01:04:16 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat May 13 01:04:16 2017 +0000
tree 4b54f7a4c46b14b7cdfdf87905685914b674972b
parent 14ede32e19e5cfcf45dedccc19966d154957abac
parent 72edfe46fe5a819ec86bad088428371f91283ea6

Merge "Add new reason code for IMS Call ended during conference merge process" into oc-dev am: a1755c4fd6
am: 72edfe46fe

Change-Id: If924eb58b180d6e4e7ddd3547a2ddd8d9705d967

telephony/java/com/android/ims/ImsReasonInfo.java

diff --git a/telephony/java/com/android/ims/ImsReasonInfo.java b/telephony/java/com/android/ims/ImsReasonInfo.java
index bd8492b3..48f07d6 100644
--- a/telephony/java/com/android/ims/ImsReasonInfo.java
+++ b/telephony/java/com/android/ims/ImsReasonInfo.java
@@ -45,6 +45,8 @@
     public static final int CODE_LOCAL_IMS_SERVICE_DOWN = 106;
     // No pending incoming call exists
     public static final int CODE_LOCAL_NO_PENDING_CALL = 107;
+    // IMS Call ended during conference merge process
+    public static final int CODE_LOCAL_ENDED_BY_CONFERENCE_MERGE = 108;
 
     // IMS -> Telephony
     // Service unavailable; by power off