Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d0d3434 authored by Tyler Gunn's avatar Tyler Gunn Committed by Android (Google) Code Review
Browse files

Merge changes from topic "remap-code" into qt-r1-dev 

* changes:
  Add disconnect causes for WFC use cases.
  Add MEDIA_TIMEOUT error for RTCP timeout
parents fd47f70b edcf4aef

telephony/java/android/telephony/DisconnectCause.java

+26 −0
Original line number Diff line number Diff line
@@ -333,6 +333,26 @@ 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;



    /**

     * 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.
@@ -501,6 +521,12 @@ 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";

        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;

        }

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

+13 −0
Original line number Diff line number Diff line
@@ -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.