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

Commit 54d7eb44 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "DeactivateDataCall remove network on all errors" into tm-dev

parents 70bbc8e6 83cfcaf9

telephony/java/android/telephony/data/DataServiceCallback.java

+5 −5
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ public class DataServiceCallback { 
    @Retention(RetentionPolicy.SOURCE)

    @IntDef({RESULT_SUCCESS, RESULT_ERROR_UNSUPPORTED, RESULT_ERROR_INVALID_ARG, RESULT_ERROR_BUSY,

            RESULT_ERROR_ILLEGAL_STATE, RESULT_ERROR_TEMPORARILY_UNAVAILABLE,

            RESULT_ERROR_RADIO_NOT_AVAILABLE})

            RESULT_ERROR_INVALID_RESPONSE})

    public @interface ResultCode {}



    /** Request is completed successfully */
@@ -70,10 +70,10 @@ public class DataServiceCallback { 
     */

    public static final int RESULT_ERROR_TEMPORARILY_UNAVAILABLE = 5;

    /**

     * Request failed to complete due to radio not available.

     * Request failed to complete due to an invalid response.

     * @hide

     */

    public static final int RESULT_ERROR_RADIO_NOT_AVAILABLE = 6;

    public static final int RESULT_ERROR_INVALID_RESPONSE = 6;



    private final IDataServiceCallback mCallback;
@@ -261,8 +261,8 @@ public class DataServiceCallback { 
                return "RESULT_ERROR_ILLEGAL_STATE";

            case RESULT_ERROR_TEMPORARILY_UNAVAILABLE:

                return "RESULT_ERROR_TEMPORARILY_UNAVAILABLE";

            case RESULT_ERROR_RADIO_NOT_AVAILABLE:

                return "RESULT_ERROR_RADIO_NOT_AVAILABLE";

            case RESULT_ERROR_INVALID_RESPONSE:

                return "RESULT_ERROR_INVALID_RESPONSE";

            default:

                return "Unknown(" + resultCode + ")";

        }