From 4e8a933e816fbad50ca561c81a521f4cf4e21a67 Mon Sep 17 00:00:00 2001 From: Sarah Chin Date: Fri, 4 Mar 2022 16:16:55 -0800 Subject: [PATCH 1/2] Add ERROR_RADIO_NOT_AVAILABLE for DataServiceCallback Test: atest DataNetworkTest, DataNetworkControllerTest Bug: 221174412 Change-Id: Ib457e598ea5ada76813cb233be5b0a5cde260acc Merged-In: Ib457e598ea5ada76813cb233be5b0a5cde260acc --- .../android/telephony/data/DataServiceCallback.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/telephony/java/android/telephony/data/DataServiceCallback.java b/telephony/java/android/telephony/data/DataServiceCallback.java index ec734716f6e47..b8c5b4e3628a1 100644 --- a/telephony/java/android/telephony/data/DataServiceCallback.java +++ b/telephony/java/android/telephony/data/DataServiceCallback.java @@ -50,12 +50,13 @@ 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_ILLEGAL_STATE, RESULT_ERROR_TEMPORARILY_UNAVAILABLE, + RESULT_ERROR_RADIO_NOT_AVAILABLE}) public @interface ResultCode {} /** Request is completed successfully */ public static final int RESULT_SUCCESS = 0; - /** Request is not support */ + /** Request is not supported */ public static final int RESULT_ERROR_UNSUPPORTED = 1; /** Request contains invalid arguments */ public static final int RESULT_ERROR_INVALID_ARG = 2; @@ -68,6 +69,11 @@ public class DataServiceCallback { * @hide */ public static final int RESULT_ERROR_TEMPORARILY_UNAVAILABLE = 5; + /** + * Request failed to complete due to radio not available. + * @hide + */ + public static final int RESULT_ERROR_RADIO_NOT_AVAILABLE = 6; private final IDataServiceCallback mCallback; @@ -255,6 +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"; default: return "Unknown(" + resultCode + ")"; } From e36793df470f6ce88b8cf458b11b1832e4554bba Mon Sep 17 00:00:00 2001 From: Sarah Chin Date: Mon, 7 Mar 2022 15:56:29 -0800 Subject: [PATCH 2/2] 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 --- .../android/telephony/data/DataServiceCallback.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/telephony/java/android/telephony/data/DataServiceCallback.java b/telephony/java/android/telephony/data/DataServiceCallback.java index b8c5b4e3628a1..77d4837ccfb69 100644 --- a/telephony/java/android/telephony/data/DataServiceCallback.java +++ b/telephony/java/android/telephony/data/DataServiceCallback.java @@ -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 + ")"; }