From 354140fd8c0c04a3ab2dab114951602453544273 Mon Sep 17 00:00:00 2001 From: Sarah Chin Date: Mon, 7 Mar 2022 16:02:13 -0800 Subject: [PATCH] DeactivateDataCall remove network on all errors Remove network on all errors instead of only RADIO_NOT_AVAIALBLE. Test: atest DataNetworkTest Bug: 219998284 Change-Id: I9e36829c627c7fa1286174e536ef5ff561e8b142 Merged-In: I9e36829c627c7fa1286174e536ef5ff561e8b142 --- radio/aidl/android/hardware/radio/data/IRadioData.aidl | 2 +- .../aidl/android/hardware/radio/data/IRadioDataResponse.aidl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/radio/aidl/android/hardware/radio/data/IRadioData.aidl b/radio/aidl/android/hardware/radio/data/IRadioData.aidl index 724b515945..0171d39b42 100644 --- a/radio/aidl/android/hardware/radio/data/IRadioData.aidl +++ b/radio/aidl/android/hardware/radio/data/IRadioData.aidl @@ -65,7 +65,7 @@ oneway interface IRadioData { /** * Deactivate packet data connection and remove from the data call list. An * unsolDataCallListChanged() must be sent when data connection is deactivated. - * A return value of RadioError::RADIO_NOT_AVAILABLE will remove the network from the list. + * Any return value other than RadioError::NONE will remove the network from the list. * * @param serial Serial number of request. * @param cid Data call id. diff --git a/radio/aidl/android/hardware/radio/data/IRadioDataResponse.aidl b/radio/aidl/android/hardware/radio/data/IRadioDataResponse.aidl index 1cb8ff3fd5..88b6c1b720 100644 --- a/radio/aidl/android/hardware/radio/data/IRadioDataResponse.aidl +++ b/radio/aidl/android/hardware/radio/data/IRadioDataResponse.aidl @@ -67,8 +67,8 @@ oneway interface IRadioDataResponse { * * Valid errors returned: * RadioError:REQUEST_NOT_SUPPORTED may be returned when HAL 1.2 or higher is supported. - * RadioError:NONE - * RadioError:RADIO_NOT_AVAILABLE will remove the network from the list. + * RadioError:NONE indicates success. Any other error will remove the network from the list. + * RadioError:RADIO_NOT_AVAILABLE * RadioError:INVALID_CALL_ID * RadioError:INVALID_STATE * RadioError:INVALID_ARGUMENTS