From 46b32df18b5f9e6b628f548a9053d94fa51475a5 Mon Sep 17 00:00:00 2001
From: Youming Ye <paulye@google.com>
Date: Wed, 10 Apr 2019 14:50:19 -0700
Subject: [PATCH 1/2] Add MEDIA_TIMEOUT error for RTCP timeout

Bug: 130167535
Test: Build
Change-Id: I7498072a1c6a9ecf084308e91db07f3731969106
---
 telephony/java/android/telephony/DisconnectCause.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/telephony/java/android/telephony/DisconnectCause.java b/telephony/java/android/telephony/DisconnectCause.java
index 6e839ab0ad6bb..cdf4c935f84bb 100644
--- a/telephony/java/android/telephony/DisconnectCause.java
+++ b/telephony/java/android/telephony/DisconnectCause.java
@@ -333,6 +333,13 @@ public final class DisconnectCause {
      */
     public static final int OTASP_PROVISIONING_IN_PROCESS = 76;
 
+    /**
+     * Indicates that the call is dropped due to RTCP inactivity, primarily due to media path
+     * disruption.
+     * @hide
+     */
+    public static final int MEDIA_TIMEOUT = 77;
+
     //*********************************************************************************************
     // When adding a disconnect type:
     // 1) Update toString() with the newly added disconnect type.
@@ -501,6 +508,8 @@ public final class DisconnectCause {
             return "TOO_MANY_ONGOING_CALLS";
         case OTASP_PROVISIONING_IN_PROCESS:
             return "OTASP_PROVISIONING_IN_PROCESS";
+        case MEDIA_TIMEOUT:
+            return "MEDIA_TIMEOUT";
         default:
             return "INVALID: " + cause;
         }

From edcf4aef389d3be4b4c491fd8a20e4409785f112 Mon Sep 17 00:00:00 2001
From: Tyler Gunn <tgunn@google.com>
Date: Mon, 29 Jul 2019 14:46:36 -0700
Subject: [PATCH 2/2] Add disconnect causes for WFC use cases.

Add new disconnect cause used when an attempt is made to place an
emergency call over WFC but the service is unavailable.
Add new disconnect cause when WFC is not available in an area.

Bug: 128993720
Test: Unit tests added to confirm remapping.
Change-Id: I15dcff8fabc06b5d469d083b0970fe0e77e7d318
---
 .../java/android/telephony/DisconnectCause.java | 17 +++++++++++++++++
 .../android/telephony/ims/ImsReasonInfo.java    | 13 +++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/telephony/java/android/telephony/DisconnectCause.java b/telephony/java/android/telephony/DisconnectCause.java
index cdf4c935f84bb..aa7e21a825009 100644
--- a/telephony/java/android/telephony/DisconnectCause.java
+++ b/telephony/java/android/telephony/DisconnectCause.java
@@ -340,6 +340,19 @@ public final class DisconnectCause {
      */
     public static final int MEDIA_TIMEOUT = 77;
 
+    /**
+     * Indicates that an emergency call cannot be placed over WFC because the service is not
+     * available in the current location.
+     * @hide
+     */
+    public static final int EMERGENCY_CALL_OVER_WFC_NOT_AVAILABLE = 78;
+
+    /**
+     * Indicates that WiFi calling service is not available in the current location.
+     * @hide
+     */
+    public static final int WFC_SERVICE_NOT_AVAILABLE_IN_THIS_LOCATION = 79;
+
     //*********************************************************************************************
     // When adding a disconnect type:
     // 1) Update toString() with the newly added disconnect type.
@@ -510,6 +523,10 @@ public final class DisconnectCause {
             return "OTASP_PROVISIONING_IN_PROCESS";
         case MEDIA_TIMEOUT:
             return "MEDIA_TIMEOUT";
+        case EMERGENCY_CALL_OVER_WFC_NOT_AVAILABLE:
+            return "EMERGENCY_CALL_OVER_WFC_NOT_AVAILABLE";
+        case WFC_SERVICE_NOT_AVAILABLE_IN_THIS_LOCATION:
+            return "WFC_SERVICE_NOT_AVAILABLE_IN_THIS_LOCATION";
         default:
             return "INVALID: " + cause;
         }
diff --git a/telephony/java/android/telephony/ims/ImsReasonInfo.java b/telephony/java/android/telephony/ims/ImsReasonInfo.java
index a478606da22af..20aba4d97849f 100644
--- a/telephony/java/android/telephony/ims/ImsReasonInfo.java
+++ b/telephony/java/android/telephony/ims/ImsReasonInfo.java
@@ -871,6 +871,19 @@ public final class ImsReasonInfo implements Parcelable {
      */
     public static final int CODE_REJECT_ONGOING_CS_CALL = 1621;
 
+    /**
+     * An attempt was made to place an emergency call over WFC when emergency services is not
+     * currently available in the current location.
+     * @hide
+     */
+    public static final int CODE_EMERGENCY_CALL_OVER_WFC_NOT_AVAILABLE = 1622;
+
+    /**
+     * Indicates that WiFi calling service is not available in the current location.
+     * @hide
+     */
+    public static final int CODE_WFC_SERVICE_NOT_AVAILABLE_IN_THIS_LOCATION = 1623;
+
     /*
      * 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.