Merge "IMS: Add support for additional call information" into s-keystone-qcom-dev

2 files changed, 16 insertions, 2 deletions

diff --git a/telephony/java/android/telephony/DisconnectCause.java b/telephony/java/android/telephony/DisconnectCause.java
index 4a65d0010076..2cf2511cd632 100644
--- a/telephony/java/android/telephony/DisconnectCause.java
+++ b/telephony/java/android/telephony/DisconnectCause.java
@@ -455,6 +455,8 @@ public final class DisconnectCause {
     public static final int HO_NOT_FEASIBLE = 125;
     /** @hide */
     public static final int NON_SELECTED_USER_CLEARING = 126;
+    /** @hide */
+    public static final int CONCURRENT_CALLS_NOT_POSSIBLE = 127;
 
     //*********************************************************************************************
     // When adding a disconnect type:
@@ -464,7 +466,7 @@ public final class DisconnectCause {
     // 4) Update toString() with the newly added disconnect type.
     // 5) Update android.telecom.DisconnectCauseUtil with any mappings to a telecom.DisconnectCause.
     //
-    // NextId: 123
+    // NextId: 128
     //*********************************************************************************************
 
     /**
@@ -477,7 +479,7 @@ public final class DisconnectCause {
      * Largest valid value for call disconnect codes.
      * @hide
      */
-    public static final int MAXIMUM_VALID_VALUE = NON_SELECTED_USER_CLEARING;
+    public static final int MAXIMUM_VALID_VALUE = CONCURRENT_CALLS_NOT_POSSIBLE;
 
     /** Private constructor to avoid class instantiation. */
     private DisconnectCause() {
@@ -741,6 +743,8 @@ public final class DisconnectCause {
             return "HO_NOT_FEASIBLE";
         case NON_SELECTED_USER_CLEARING:
             return "NON_SELECTED_USER_CLEARING";
+        case CONCURRENT_CALLS_NOT_POSSIBLE:
+            return "CONCURRENT_CALLS_NOT_POSSIBLE";
         default:
             return "INVALID: " + cause;
         }
diff --git a/telephony/java/android/telephony/ims/ImsReasonInfo.java b/telephony/java/android/telephony/ims/ImsReasonInfo.java
index dda021e6172f..31ede00955da 100644
--- a/telephony/java/android/telephony/ims/ImsReasonInfo.java
+++ b/telephony/java/android/telephony/ims/ImsReasonInfo.java
@@ -902,6 +902,14 @@ public final class ImsReasonInfo implements Parcelable {
      */
     public static final int CODE_RETRY_ON_IMS_WITHOUT_RTT = 3001;
 
+    /**
+     * Call failed due to concurrent calls not possible, this value should be in sync with {link@
+     * QtiCallConstants.CODE_CONCURRENT_CALLS_NOT_POSSIBLE}.
+     *
+     * @hide
+     */
+    public static final int CODE_CONCURRENT_CALLS_NOT_POSSIBLE = 3002;
+
     /*
      * OEM specific error codes. To be used by OEMs when they don't want to reveal error code which
      * would be replaced by ERROR_UNSPECIFIED.
@@ -1084,6 +1092,7 @@ public final class ImsReasonInfo implements Parcelable {
             CODE_REJECT_ONGOING_CS_CALL,
             CODE_NETWORK_CONGESTION,
             CODE_RETRY_ON_IMS_WITHOUT_RTT,
+            CODE_CONCURRENT_CALLS_NOT_POSSIBLE,
             CODE_OEM_CAUSE_1,
             CODE_OEM_CAUSE_2,
             CODE_OEM_CAUSE_3,
@@ -1277,6 +1286,7 @@ public final class ImsReasonInfo implements Parcelable {
         sImsCodeMap.put(CODE_REJECT_ONGOING_CS_CALL, "CODE_REJECT_ONGOING_CS_CALL");
         sImsCodeMap.put(CODE_NETWORK_CONGESTION, "CODE_NETWORK_CONGESTION");
         sImsCodeMap.put(CODE_RETRY_ON_IMS_WITHOUT_RTT, "CODE_RETRY_ON_IMS_WITHOUT_RTT");
+        sImsCodeMap.put(CODE_CONCURRENT_CALLS_NOT_POSSIBLE, "CODE_CONCURRENT_CALLS_NOT_POSSIBLE");
         sImsCodeMap.put(CODE_OEM_CAUSE_1, "CODE_OEM_CAUSE_1");
         sImsCodeMap.put(CODE_OEM_CAUSE_2, "CODE_OEM_CAUSE_2");
         sImsCodeMap.put(CODE_OEM_CAUSE_3, "CODE_OEM_CAUSE_3");