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

Commit 3c22996e authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge changes from topics "deactivate_all_errors", "deactivate_radio_not_available" am: 6586f342 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2057049



Change-Id: If6d66efeef7892e965e0ba0c822eccb850b03510
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e1643fb0 6586f342

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 + ")";

        }