From 236e8e4b7819c8aa1279bcd5c7bcf3a3f95337f5 Mon Sep 17 00:00:00 2001 From: Naina Nalluri Date: Mon, 17 Jul 2017 11:56:42 -0700 Subject: [PATCH 1/2] Change mapping of QMI error Change mapping of QMI_ERR_OP_NETWORK_UNSUPPORTED from MODE_NOT_SUPPORTED to OPERATION_NOT_ALLOWED. Test: run vts Bug: 62584347 Change-Id: I16a17579581f891701750b4be52cc2ef57594d0c --- current.txt | 2 +- radio/1.0/IRadioResponse.hal | 15 +++++---------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/current.txt b/current.txt index d93352a608..7f95c44076 100644 --- a/current.txt +++ b/current.txt @@ -190,7 +190,7 @@ fe3c3c2f572b72f15f8594c538b0577bd5c28722c31879cfe6231330cddb6747 android.hardwar # ABI preserving changes to HALs released in Android O 760485232f6cce07f8bb05e3475509956996b702f77415ee5bff05e2ec5a5bcc android.hardware.dumpstate@1.0::IDumpstateDevice -1fecfa1609ff9d27ebf761a84b4336efa9d5dac5b241f19a6663f70d8db2c4b1 android.hardware.radio@1.0::IRadioResponse +e822cb7f4a1bdd45689c5e92ccd19a2201c20b771bd4b2ec1ae627e324591f9d android.hardware.radio@1.0::IRadioResponse 28e929b453df3d9f5060af2764e6cdb123ddb893e3e86923c877f6ff7e5f02c9 android.hardware.wifi@1.0::types # HALs released in Android O MR1 diff --git a/radio/1.0/IRadioResponse.hal b/radio/1.0/IRadioResponse.hal index 9f19169f07..a94aac3352 100644 --- a/radio/1.0/IRadioResponse.hal +++ b/radio/1.0/IRadioResponse.hal @@ -201,7 +201,7 @@ interface IRadioResponse { * RadioError:NO_NETWORK_FOUND * RadioError:INVALID_CALL_ID * RadioError:DEVICE_IN_USE - * RadioError:MODE_NOT_SUPPORTED + * RadioError:OPERATION_NOT_ALLOWED * RadioError:ABORTED * RadioError:SYSTEM_ERR * RadioError:REQUEST_NOT_SUPPORTED @@ -537,7 +537,6 @@ interface IRadioResponse { * RadioError:INVALID_SMSC_ADDRESS * RadioError:MODEM_ERR * RadioError:NETWORK_ERR - * RadioError:MODE_NOT_SUPPORTED * RadioError:INTERNAL_ERR * RadioError:REQUEST_NOT_SUPPORTED * RadioError:INVALID_MODEM_STATE @@ -568,7 +567,6 @@ interface IRadioResponse { * RadioError:INVALID_SMSC_ADDRESS * RadioError:MODEM_ERR * RadioError:NETWORK_ERR - * RadioError:MODE_NOT_SUPPORTED * RadioError:INTERNAL_ERR * RadioError:REQUEST_NOT_SUPPORTED * RadioError:INVALID_MODEM_STATE @@ -1205,7 +1203,7 @@ interface IRadioResponse { * RadioError:NO_MEMORY * RadioError:NO_RESOURCES * RadioError:INVALID_MODEM_STATE - * RadioError:MODE_NOT_SUPPORTED + * RadioError:OPERATION_NOT_ALLOWED * RadioError:INVALID_SMSC_ADDRESS * RadioError:RADIO_NOT_AVAILABLE * RadioError:SYSTEM_ERR @@ -1565,7 +1563,7 @@ interface IRadioResponse { * RadioError:INVALID_MODEM_STATE * RadioError:NO_RESOURCES * RadioError:CANCELLED - * RadioError:MODE_NOT_SUPPORTED + * RadioError:OPERATION_NOT_ALLOWED */ oneway sendCDMAFeatureCodeResponse(RadioResponseInfo info); @@ -1586,7 +1584,7 @@ interface IRadioResponse { * RadioError:NO_RESOURCES * RadioError:CANCELLED * RadioError:INVALID_MODEM_STATE - * RadioError:MODE_NOT_SUPPORTED + * RadioError:OPERATION_NOT_ALLOWED */ oneway sendBurstDtmfResponse(RadioResponseInfo info); @@ -1610,7 +1608,6 @@ interface IRadioResponse { * RadioError:NETWORK_ERR * RadioError:ENCODING_ERR * RadioError:INVALID_SMSC_ADDRESS - * RadioError:MODE_NOT_SUPPORTED * RadioError:INTERNAL_ERR * RadioError:SYSTEM_ERR * RadioError:REQUEST_NOT_SUPPORTED @@ -1634,7 +1631,6 @@ interface IRadioResponse { * RadioError:REQUEST_RATE_LIMITED * RadioError:SYSTEM_ERR * RadioError:MODEM_ERR - * RadioError:MODE_NOT_SUPPORTED * RadioError:NETWORK_NOT_READY * RadioError:INVALID_MODEM_STATE * RadioError:INTERNAL_ERR @@ -1816,7 +1812,6 @@ interface IRadioResponse { * RadioError:NO_MEMORY * RadioError:NO_RESOURCES * RadioError:INVALID_MODEM_STATE - * RadioError:MODE_NOT_SUPPORTED * RadioError:INVALID_SMSC_ADDRESS * RadioError:SYSTEM_ERR * RadioError:REQUEST_NOT_SUPPORTED @@ -2138,7 +2133,7 @@ interface IRadioResponse { * RadioError:MODEM_ERR * RadioError:NETWORK_ERR * RadioError:ENCODING_ERR - * RadioError:MODE_NOT_SUPPORTED + * RadioError:OPERATION_NOT_ALLOWED * RadioError:INTERNAL_ERR * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NETWORK_NOT_READY From ba1a060051d2dfe4d89fc59f341df04034a1a16a Mon Sep 17 00:00:00 2001 From: sqian Date: Mon, 17 Jul 2017 15:43:08 -0700 Subject: [PATCH 2/2] Modified error code for OPERATION_NOT_ALLOWED Test: run vts Bug: 62584347 Change-Id: I3abacdbcc5391c790f61c7f5710c1292447a29b6 --- radio/1.0/vts/functional/radio_hidl_hal_voice.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/radio/1.0/vts/functional/radio_hidl_hal_voice.cpp b/radio/1.0/vts/functional/radio_hidl_hal_voice.cpp index 6655fc7ba3..8d6e200f27 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_voice.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_voice.cpp @@ -57,7 +57,7 @@ TEST_F(RadioHidlTest, dial) { radioRsp->rspInfo.error == RadioError::NO_NETWORK_FOUND || radioRsp->rspInfo.error == RadioError::INVALID_CALL_ID || radioRsp->rspInfo.error == RadioError::DEVICE_IN_USE || - radioRsp->rspInfo.error == RadioError::MODE_NOT_SUPPORTED || + radioRsp->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED || radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE || radioRsp->rspInfo.error == RadioError::CANCELLED); } @@ -372,7 +372,7 @@ TEST_F(RadioHidlTest, sendCDMAFeatureCode) { radioRsp->rspInfo.error == RadioError::INVALID_CALL_ID || radioRsp->rspInfo.error == RadioError::INVALID_MODEM_STATE || radioRsp->rspInfo.error == RadioError::MODEM_ERR || - radioRsp->rspInfo.error == RadioError::MODE_NOT_SUPPORTED); + radioRsp->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED); } } @@ -487,6 +487,6 @@ TEST_F(RadioHidlTest, sendBurstDtmf) { radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || radioRsp->rspInfo.error == RadioError::INVALID_STATE || radioRsp->rspInfo.error == RadioError::MODEM_ERR || - radioRsp->rspInfo.error == RadioError::MODE_NOT_SUPPORTED); + radioRsp->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED); } } \ No newline at end of file