DeactivateDataCall remove network on all errors

Remove network on all errors instead of only RADIO_NOT_AVAIALBLE.

Test: atest DataNetworkTest
Bug: 219998284
Change-Id: Ia1f2e5cd63bcf93967ea4fd4a35fcb9515c5e3f3
Merged-In: Ia1f2e5cd63bcf93967ea4fd4a35fcb9515c5e3f3
This commit is contained in:
Sarah Chin
2022-03-07 15:56:29 -08:00
parent 4e8a933e81
commit e36793df47

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