diff --git a/current.txt b/current.txt index e714b6211d..0627b6c534 100644 --- a/current.txt +++ b/current.txt @@ -190,3 +190,4 @@ fe3c3c2f572b72f15f8594c538b0577bd5c28722c31879cfe6231330cddb6747 android.hardwar # ABI preserving changes to HALs released in Android O 78589343d8ee2e1b155acad3fbdc7fcbb6af94491aee968b2383c21627264f8b android.hardware.radio@1.0::IRadioResponse +c2c50ec74c87a583c683b4493f8f9f2e454a8d41c57af5b3eb88823a999f0ea4 android.hardware.radio@1.0::IRadioResponse diff --git a/radio/1.0/IRadioResponse.hal b/radio/1.0/IRadioResponse.hal index 8697e57d91..45cdd1c755 100644 --- a/radio/1.0/IRadioResponse.hal +++ b/radio/1.0/IRadioResponse.hal @@ -1186,6 +1186,7 @@ interface IRadioResponse { * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED + * RadioError:SIM_ABSENT */ oneway setSuppServiceNotificationsResponse(RadioResponseInfo info); @@ -1289,6 +1290,7 @@ interface IRadioResponse { * RadioError:INVALID_ARGUMENTS * RadioError:MODEM_ERR * RadioError:REQUEST_NOT_SUPPORTED + * RadioError:SIM_ABSENT */ oneway sendEnvelopeResponse(RadioResponseInfo info, string commandResponse); @@ -1306,6 +1308,7 @@ interface IRadioResponse { * RadioError:CANCELLED * RadioError:INVALID_MODEM_STATE * RadioError:REQUEST_NOT_SUPPORTED + * RadioError:SIM_ABSENT */ oneway sendTerminalResponseToSimResponse(RadioResponseInfo info); @@ -1323,6 +1326,7 @@ interface IRadioResponse { * RadioError:NO_RESOURCES * RadioError:CANCELLED * RadioError:REQUEST_NOT_SUPPORTED + * RadioError:SIM_ABSENT */ oneway handleStkCallSetupRequestFromSimResponse(RadioResponseInfo info); @@ -1419,6 +1423,7 @@ interface IRadioResponse { * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED + * RadioError:SIM_ABSENT */ oneway setLocationUpdatesResponse(RadioResponseInfo info); @@ -1453,6 +1458,7 @@ interface IRadioResponse { * RadioError:OPERATION_NOT_ALLOWED * RadioError:NO_RESOURCES * RadioError:CANCELLED + * RadioError:SIM_ABSENT */ oneway setCdmaRoamingPreferenceResponse(RadioResponseInfo info); @@ -1471,6 +1477,7 @@ interface IRadioResponse { * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED + * RadioError:SIM_ABSENT */ oneway getCdmaRoamingPreferenceResponse(RadioResponseInfo info, CdmaRoamingType type); @@ -1795,6 +1802,7 @@ interface IRadioResponse { * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED + * RadioError:SIM_ABSENT */ oneway getCDMASubscriptionResponse(RadioResponseInfo info, string mdn, string hSid, string hNid, string min, string prl); @@ -1888,6 +1896,7 @@ interface IRadioResponse { * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES * RadioError:CANCELLED + * RadioError:SIM_ABSENT */ oneway exitEmergencyCallbackModeResponse(RadioResponseInfo info); @@ -1980,6 +1989,7 @@ interface IRadioResponse { * RadioError:NO_RESOURCES * RadioError:CANCELLED * RadioError:REQUEST_NOT_SUPPORTED + * RadioError:SIM_ABSENT */ oneway getCdmaSubscriptionSourceResponse(RadioResponseInfo info, CdmaSubscriptionSource source); @@ -1997,6 +2007,7 @@ interface IRadioResponse { * RadioError:INVALID_MODEM_STATE * RadioError:INVALID_ARGUMENTS * RadioError:REQUEST_NOT_SUPPORTED + * RadioError:SIM_ABSENT */ oneway requestIsimAuthenticationResponse(RadioResponseInfo info, string response); diff --git a/radio/1.0/vts/functional/radio_hidl_hal_ims.cpp b/radio/1.0/vts/functional/radio_hidl_hal_ims.cpp index 16465c71a3..e8a61b4588 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_ims.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_ims.cpp @@ -155,7 +155,8 @@ TEST_F(RadioHidlTest, setSuppServiceNotifications) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error); + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || + radioRsp->rspInfo.error == RadioError::SIM_ABSENT); } } @@ -173,7 +174,7 @@ TEST_F(RadioHidlTest, requestIsimAuthentication) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(CheckGeneralError()); + ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::SIM_ABSENT); } } diff --git a/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp b/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp index a3ae1e3eac..6beb580304 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp @@ -265,7 +265,8 @@ TEST_F(RadioHidlTest, setLocationUpdates) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || + radioRsp->rspInfo.error == RadioError::SIM_ABSENT); } } @@ -282,7 +283,8 @@ TEST_F(RadioHidlTest, setCdmaRoamingPreference) { if (cardStatus.cardState == CardState::ABSENT) { ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || - radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED); + radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED || + radioRsp->rspInfo.error == RadioError::SIM_ABSENT); } } @@ -299,7 +301,8 @@ TEST_F(RadioHidlTest, getCdmaRoamingPreference) { if (cardStatus.cardState == CardState::ABSENT) { ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::NONE || - radioRsp->rspInfo.error == RadioError::MODEM_ERR); + radioRsp->rspInfo.error == RadioError::MODEM_ERR || + radioRsp->rspInfo.error == RadioError::SIM_ABSENT); } } @@ -381,7 +384,9 @@ TEST_F(RadioHidlTest, getCDMASubscription) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || + radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED || + radioRsp->rspInfo.error == RadioError::SIM_ABSENT); } } @@ -414,7 +419,9 @@ TEST_F(RadioHidlTest, exitEmergencyCallbackMode) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || + radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED || + radioRsp->rspInfo.error == RadioError::SIM_ABSENT); } } @@ -430,7 +437,9 @@ TEST_F(RadioHidlTest, getCdmaSubscriptionSource) { EXPECT_EQ(serial, radioRsp->rspInfo.serial); if (cardStatus.cardState == CardState::ABSENT) { - ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE); + ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || + radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED || + radioRsp->rspInfo.error == RadioError::SIM_ABSENT); } } diff --git a/radio/1.0/vts/functional/radio_hidl_hal_stk.cpp b/radio/1.0/vts/functional/radio_hidl_hal_stk.cpp index 261f534afc..1a755eae18 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_stk.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_stk.cpp @@ -37,7 +37,8 @@ TEST_F(RadioHidlTest, sendEnvelope) { std::cout << static_cast(radioRsp->rspInfo.error) << std::endl; ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::NONE); + radioRsp->rspInfo.error == RadioError::NONE || + radioRsp->rspInfo.error == RadioError::SIM_ABSENT); } } @@ -60,7 +61,8 @@ TEST_F(RadioHidlTest, sendTerminalResponseToSim) { std::cout << static_cast(radioRsp->rspInfo.error) << std::endl; ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || - radioRsp->rspInfo.error == RadioError::NONE); + radioRsp->rspInfo.error == RadioError::NONE || + radioRsp->rspInfo.error == RadioError::SIM_ABSENT); } } @@ -81,7 +83,8 @@ TEST_F(RadioHidlTest, handleStkCallSetupRequestFromSim) { ASSERT_TRUE(CheckGeneralError() || radioRsp->rspInfo.error == RadioError::NONE || radioRsp->rspInfo.error == RadioError::MODEM_ERR || - radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS); + radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS || + radioRsp->rspInfo.error == RadioError::SIM_ABSENT); } }