From fbb1ea5a2e52f2d3ed0b9f4c753d535fde817419 Mon Sep 17 00:00:00 2001 From: Jayachandran C Date: Mon, 13 Mar 2017 19:23:52 -0700 Subject: [PATCH] Return meaningful error code for RIL_REQUEST_QUERY_AVAILABLE_NETWORKS Updated documentation for INTERNAL_ERR & MODEM_ERR Bug: 34102797 Change-Id: Ic3bf0c987dcb7dc04ab086aeb185c307685c0485 --- radio/1.0/IRadio.hal | 1 - radio/1.0/IRadioResponse.hal | 7 +++++-- radio/1.0/types.hal | 6 ++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/radio/1.0/IRadio.hal b/radio/1.0/IRadio.hal index b3e3e9862e..0b1bf40b72 100644 --- a/radio/1.0/IRadio.hal +++ b/radio/1.0/IRadio.hal @@ -630,7 +630,6 @@ interface IRadio { /* * Scans for available networks - * This request must not respond until the new operator is selected and registered. * * @param serial Serial number of request. * diff --git a/radio/1.0/IRadioResponse.hal b/radio/1.0/IRadioResponse.hal index cd0899abfb..bf50792729 100644 --- a/radio/1.0/IRadioResponse.hal +++ b/radio/1.0/IRadioResponse.hal @@ -787,10 +787,13 @@ interface IRadioResponse { * * Valid errors returned: * RadioError:NONE - * RadioError:INVALID_ARGUMENTS * RadioError:RADIO_NOT_AVAILABLE * RadioError:OPERATION_NOT_ALLOWED - * RadioError:GENERIC_FAILURE + * RadioError:ABORTED + * RadioError:DEVICE_IN_USE + * RadioError:INTERNAL_ERR + * RadioError:NO_MEMORY + * RadioError:MODEM_ERR */ oneway getAvailableNetworksResponse(RadioResponseInfo info, vec networkInfos); diff --git a/radio/1.0/types.hal b/radio/1.0/types.hal index 7c1d1439a7..9b904a56ef 100644 --- a/radio/1.0/types.hal +++ b/radio/1.0/types.hal @@ -86,9 +86,11 @@ enum RadioError : int32_t { SS_MODIFIED_TO_SS = 27, // SS request modified to different SS request LCE_NOT_SUPPORTED = 36, // LCE service not supported(36 in RILConstants.java) NO_MEMORY = 37, // Not sufficient memory to process the request - INTERNAL_ERR = 38, // Hit unexpected vendor internal error scenario + INTERNAL_ERR = 38, // Modem hit unexpected error scenario while handling + // this request SYSTEM_ERR = 39, // Hit platform or system error - MODEM_ERR = 40, // Hit unexpected modem error + MODEM_ERR = 40, // Vendor RIL got unexpected or incorrect response + // from modem for this request INVALID_STATE = 41, // Unexpected request for the current state NO_RESOURCES = 42, // Not sufficient resource to process the request SIM_ERR = 43, // Received error from SIM card