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

Commit 48f75b71 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Remove RESULT_ERROR_INVALID_RESPONSE" into tm-dev am: 0da25d0c 

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

Change-Id: Iba11f25f707d9bfaffc589f9bf82cd12c9d27069
parents ceb30c44 0da25d0c

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

+1 −9
Original line number Diff line number Diff line
@@ -50,8 +50,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_INVALID_RESPONSE})

            RESULT_ERROR_ILLEGAL_STATE, RESULT_ERROR_TEMPORARILY_UNAVAILABLE})

    public @interface ResultCode {}



    /** Request is completed successfully */
@@ -69,11 +68,6 @@ public class DataServiceCallback { 
     * @hide

     */

    public static final int RESULT_ERROR_TEMPORARILY_UNAVAILABLE = 5;

    /**

     * Request failed to complete due to an invalid response.

     * @hide

     */

    public static final int RESULT_ERROR_INVALID_RESPONSE = 6;



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

            case RESULT_ERROR_TEMPORARILY_UNAVAILABLE:

                return "RESULT_ERROR_TEMPORARILY_UNAVAILABLE";

            case RESULT_ERROR_INVALID_RESPONSE:

                return "RESULT_ERROR_INVALID_RESPONSE";

            default:

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

        }