Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 22:04:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Add REQUEST_NOT_SUPPORTED / SIM_ABSENT for vts tests" into oc-dr1-dev

Browse Source
This commit is contained in:
Shuo Qian
2017-11-17 01:46:33 +00:00
committed by Android (Google) Code Review
parent a8ed4185d5 5e5b441361
commit 3f7603e3c7
5 changed files with 37 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
current.txt
View File

@@ -192,6 +192,8 @@ fe3c3c2f572b72f15f8594c538b0577bd5c28722c31879cfe6231330cddb6747 android.hardwar
760485232f6cce07f8bb05e3475509956996b702f77415ee5bff05e2ec5a5bcc android.hardware.dumpstate@1.0::IDumpstateDevice
78589343d8ee2e1b155acad3fbdc7fcbb6af94491aee968b2383c21627264f8b android.hardware.radio@1.0::IRadioResponse # Available in Android O, b/68061860
e822cb7f4a1bdd45689c5e92ccd19a2201c20b771bd4b2ec1ae627e324591f9d android.hardware.radio@1.0::IRadioResponse
c2c50ec74c87a583c683b4493f8f9f2e454a8d41c57af5b3eb88823a999f0ea4 android.hardware.radio@1.0::IRadioResponse # Added for b/65230472 for Android O
4922dd58e89a03181ed1c48a6e118e47633b73b11090bdfed5aa920d25a7592b android.hardware.radio@1.0::IRadioResponse # Added for b/65230472 for Android O DR
28e929b453df3d9f5060af2764e6cdb123ddb893e3e86923c877f6ff7e5f02c9 android.hardware.wifi@1.0::types
# HALs released in Android O MR1

11
radio/1.0/IRadioResponse.hal
View File

@@ -1184,6 +1184,7 @@ interface IRadioResponse {
* RadioError:REQUEST_NOT_SUPPORTED
* RadioError:NO_RESOURCES
* RadioError:CANCELLED
* RadioError:SIM_ABSENT
*/
oneway setSuppServiceNotificationsResponse(RadioResponseInfo info);
@@ -1287,6 +1288,7 @@ interface IRadioResponse {
* RadioError:INVALID_ARGUMENTS
* RadioError:MODEM_ERR
* RadioError:REQUEST_NOT_SUPPORTED
* RadioError:SIM_ABSENT
*/
oneway sendEnvelopeResponse(RadioResponseInfo info, string commandResponse);
@@ -1304,6 +1306,7 @@ interface IRadioResponse {
* RadioError:CANCELLED
* RadioError:INVALID_MODEM_STATE
* RadioError:REQUEST_NOT_SUPPORTED
* RadioError:SIM_ABSENT
*/
oneway sendTerminalResponseToSimResponse(RadioResponseInfo info);
@@ -1321,6 +1324,7 @@ interface IRadioResponse {
* RadioError:NO_RESOURCES
* RadioError:CANCELLED
* RadioError:REQUEST_NOT_SUPPORTED
* RadioError:SIM_ABSENT
*/
oneway handleStkCallSetupRequestFromSimResponse(RadioResponseInfo info);
@@ -1417,6 +1421,7 @@ interface IRadioResponse {
* RadioError:REQUEST_NOT_SUPPORTED
* RadioError:NO_RESOURCES
* RadioError:CANCELLED
* RadioError:SIM_ABSENT
*/
oneway setLocationUpdatesResponse(RadioResponseInfo info);
@@ -1451,6 +1456,7 @@ interface IRadioResponse {
* RadioError:OPERATION_NOT_ALLOWED
* RadioError:NO_RESOURCES
* RadioError:CANCELLED
* RadioError:SIM_ABSENT
*/
oneway setCdmaRoamingPreferenceResponse(RadioResponseInfo info);
@@ -1469,6 +1475,7 @@ interface IRadioResponse {
* RadioError:REQUEST_NOT_SUPPORTED
* RadioError:NO_RESOURCES
* RadioError:CANCELLED
* RadioError:SIM_ABSENT
*/
oneway getCdmaRoamingPreferenceResponse(RadioResponseInfo info, CdmaRoamingType type);
@@ -1792,6 +1799,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);
@@ -1884,6 +1892,7 @@ interface IRadioResponse {
* RadioError:REQUEST_NOT_SUPPORTED
* RadioError:NO_RESOURCES
* RadioError:CANCELLED
* RadioError:SIM_ABSENT
*/
oneway exitEmergencyCallbackModeResponse(RadioResponseInfo info);
@@ -1976,6 +1985,7 @@ interface IRadioResponse {
* RadioError:NO_RESOURCES
* RadioError:CANCELLED
* RadioError:REQUEST_NOT_SUPPORTED
* RadioError:SIM_ABSENT
*/
oneway getCdmaSubscriptionSourceResponse(RadioResponseInfo info, CdmaSubscriptionSource source);
@@ -1993,6 +2003,7 @@ interface IRadioResponse {
* RadioError:INVALID_MODEM_STATE
* RadioError:INVALID_ARGUMENTS
* RadioError:REQUEST_NOT_SUPPORTED
* RadioError:SIM_ABSENT
*/
oneway requestIsimAuthenticationResponse(RadioResponseInfo info, string response);

5
radio/1.0/vts/functional/radio_hidl_hal_ims.cpp
View File

@@ -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);
}
}

21
radio/1.0/vts/functional/radio_hidl_hal_misc.cpp
View File

@@ -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);
}
}

9
radio/1.0/vts/functional/radio_hidl_hal_stk.cpp
View File

@@ -38,7 +38,8 @@ TEST_F(RadioHidlTest, sendEnvelope) {
ASSERT_TRUE(CheckGeneralError() ||
radioRsp->rspInfo.error == RadioError::INVALID_ARGUMENTS ||
radioRsp->rspInfo.error == RadioError::NONE ||
radioRsp->rspInfo.error == RadioError::MODEM_ERR);
radioRsp->rspInfo.error == RadioError::MODEM_ERR ||
radioRsp->rspInfo.error == RadioError::SIM_ABSENT);
}
}
@@ -61,7 +62,8 @@ TEST_F(RadioHidlTest, sendTerminalResponseToSim) {
std::cout << static_cast<int>(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) {
if (cardStatus.cardState == CardState::ABSENT) {
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);
}
}