Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topics "deactivate_all_errors", "deactivate_radio_not_available" am: 6586f342c4 am: 3c22996ef7

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

Change-Id: I385e7189c23a77ef896284d585f30ead1a2f5347
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Sarah Chin
2022-04-06 08:12:24 +00:00
committed by Automerger Merge Worker
parent 737fef2938 3c22996ef7
commit a76612dc69
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
telephony/java/android/telephony/data/DataServiceCallback.java
View File

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