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

Commit db66e1d2 authored by Sailesh Nepal's avatar Sailesh Nepal Committed by Android (Google) Code Review
Browse files

Merge "Add CONNECTION_MANAGER_NOT_SUPPORTED to DisconnectCause" into lmp-mr1-dev

parents ff636d38 7a69c927

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -28226,6 +28226,7 @@ package android.telecom { 
    method public void writeToParcel(android.os.Parcel, int);

    field public static final int BUSY = 7; // 0x7

    field public static final int CANCELED = 4; // 0x4

    field public static final int CONNECTION_MANAGER_NOT_SUPPORTED = 10; // 0xa

    field public static final android.os.Parcelable.Creator<android.telecom.DisconnectCause> CREATOR;

    field public static final int ERROR = 1; // 0x1

    field public static final int LOCAL = 2; // 0x2

telecomm/java/android/telecom/DisconnectCause.java

+17 −3
Original line number Diff line number Diff line
@@ -58,6 +58,11 @@ public final class DisconnectCause implements Parcelable { 
    public static final int RESTRICTED = 8;

    /** Disconnected for reason not described by other disconnect codes. */

    public static final int OTHER = 9;

    /**

     * Disconnected because the connection manager did not support the call. The call will be tried

     * again without a connection manager. See {@link PhoneAccount#CAPABILITY_CONNECTION_MANAGER}.

     */

    public static final int CONNECTION_MANAGER_NOT_SUPPORTED = 10;



    private int mDisconnectCode;

    private CharSequence mDisconnectLabel;
@@ -220,7 +225,10 @@ public final class DisconnectCause implements Parcelable { 
    @Override

    public String toString() {

        String code = "";

        switch (getCode()) {

        switch (mDisconnectCode) {

            case UNKNOWN:

                code = "UNKNOWN";

                break;

            case ERROR:

                code = "ERROR";

                break;
@@ -230,6 +238,9 @@ public final class DisconnectCause implements Parcelable { 
            case REMOTE:

                code = "REMOTE";

                break;

            case CANCELED:

                code = "CANCELED";

                break;

            case MISSED:

                code = "MISSED";

                break;
@@ -245,9 +256,12 @@ public final class DisconnectCause implements Parcelable { 
            case OTHER:

                code = "OTHER";

                break;

            case UNKNOWN:

            case CONNECTION_MANAGER_NOT_SUPPORTED:

                code = "CONNECTION_MANAGER_NOT_SUPPORTED";

                break;

            default:

                code = "UNKNOWN";

                code = "invalid code: " + mDisconnectCode;

                break;

        }

        String label = mDisconnectLabel == null ? "" : mDisconnectLabel.toString();

        String description = mDisconnectDescription == null