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

Commit 8b27699f authored by Android Build Merger (Role)'s avatar Android Build Merger (Role) Committed by Android (Google) Code Review
Browse files

Merge changes from topic 'am-77f1c064e37e4a04b3ba081a7c5bc7db' into nyc-mr1-dev-plus-aosp 

* changes:
  Merge "Adds a Disconnect Cause for Emergency Redial" into nyc-mr1-dev am: 0a2d3dcb am: 831c6a83
  Adds a Disconnect Cause for Emergency Redial am: bd13f22f am: 7c8ad05c
parents 94eb506e 5b368150

telephony/java/android/telephony/DisconnectCause.java

+11 −2
Original line number Diff line number Diff line
@@ -226,6 +226,13 @@ public class DisconnectCause { 
     */

    public static final int DATA_LIMIT_REACHED = 55;



    /**

     * The emergency call was terminated because it was dialed on the wrong SIM slot.

     * The call needs to be redialed the other slot.

     * {@hide}

     */

    public static final int DIALED_ON_WRONG_SLOT = 56;



    //*********************************************************************************************

    // When adding a disconnect type:

    // 1) Please assign the new type the next id value below.
@@ -234,14 +241,14 @@ public class DisconnectCause { 
    // 4) Update toString() with the newly added disconnect type.

    // 5) Update android.telecom.DisconnectCauseUtil with any mappings to a telecom.DisconnectCause.

    //

    // NextId: 56

    // NextId: 57

    //*********************************************************************************************



    /** Smallest valid value for call disconnect codes. */

    public static final int MINIMUM_VALID_VALUE = NOT_DISCONNECTED;



    /** Largest valid value for call disconnect codes. */

    public static final int MAXIMUM_VALID_VALUE = DATA_LIMIT_REACHED;

    public static final int MAXIMUM_VALID_VALUE = DIALED_ON_WRONG_SLOT;



    /** Private constructor to avoid class instantiation. */

    private DisconnectCause() {
@@ -361,6 +368,8 @@ public class DisconnectCause { 
            return "DATA_DISABLED";

        case DATA_LIMIT_REACHED:

            return "DATA_LIMIT_REACHED";

        case DIALED_ON_WRONG_SLOT:

            return "DIALED_ON_WRONG_SLOT";

        default:

            return "INVALID: " + cause;

        }