Merge "DeactivateDataCall remove network on all errors" into tm-dev am: 54d7eb4497

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

Change-Id: I29b8d2ee762bd07f87350fdfbb2e1f3b17f7d73e
This commit is contained in:
TreeHugger Robot
2022-03-08 16:23:38 +00:00
committed by Automerger Merge Worker

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