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"

Browse Source 
* changes:
  DeactivateDataCall remove network on all errors
  Add ERROR_RADIO_NOT_AVAILABLE for DataServiceCallback
This commit is contained in:
Sarah Chin
2022-04-06 07:18:52 +00:00
committed by Gerrit Code Review
parent 5ee9c55130 e36793df47
commit 6586f342c4
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,12 +50,13 @@ public class DataServiceCallback {
*/ */
@Retention(RetentionPolicy.SOURCE) @Retention(RetentionPolicy.SOURCE)
@IntDef({RESULT_SUCCESS, RESULT_ERROR_UNSUPPORTED, RESULT_ERROR_INVALID_ARG, RESULT_ERROR_BUSY, @IntDef({RESULT_SUCCESS, RESULT_ERROR_UNSUPPORTED, RESULT_ERROR_INVALID_ARG, RESULT_ERROR_BUSY,
RESULT_ERROR_ILLEGAL_STATE}) RESULT_ERROR_ILLEGAL_STATE, RESULT_ERROR_TEMPORARILY_UNAVAILABLE,
RESULT_ERROR_INVALID_RESPONSE})
public @interface ResultCode {} public @interface ResultCode {}
/** Request is completed successfully */ /** Request is completed successfully */
public static final int RESULT_SUCCESS = 0; public static final int RESULT_SUCCESS = 0;
/** Request is not support */ /** Request is not supported */
public static final int RESULT_ERROR_UNSUPPORTED = 1; public static final int RESULT_ERROR_UNSUPPORTED = 1;
/** Request contains invalid arguments */ /** Request contains invalid arguments */
public static final int RESULT_ERROR_INVALID_ARG = 2; public static final int RESULT_ERROR_INVALID_ARG = 2;
@@ -68,6 +69,11 @@ public class DataServiceCallback {
* @hide * @hide
*/ */
public static final int RESULT_ERROR_TEMPORARILY_UNAVAILABLE = 5; 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; private final IDataServiceCallback mCallback;
@@ -255,6 +261,8 @@ public class DataServiceCallback {
return "RESULT_ERROR_ILLEGAL_STATE"; return "RESULT_ERROR_ILLEGAL_STATE";
case RESULT_ERROR_TEMPORARILY_UNAVAILABLE: case RESULT_ERROR_TEMPORARILY_UNAVAILABLE:
return "RESULT_ERROR_TEMPORARILY_UNAVAILABLE"; return "RESULT_ERROR_TEMPORARILY_UNAVAILABLE";
case RESULT_ERROR_INVALID_RESPONSE:
return "RESULT_ERROR_INVALID_RESPONSE";
default: default:
return "Unknown(" + resultCode + ")"; return "Unknown(" + resultCode + ")";
} }