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

Merge "Add REQUEST_NOT_SUPPORTED / SIM_ABSENT for vts tests" into oc-mr1-dev am: b70f1bda1f

Browse Source 
am: e99541ac02

Change-Id: Ic93e6a45afa6d4d5aff27a4d8f9e7b29ba9ae587
This commit is contained in:
sqian
2017-10-18 03:43:37 +00:00
committed by android-build-merger
parent 8201a973af e99541ac02
commit 18192d9b83
5 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
current.txt
View File

@@ -228,6 +228,7 @@ c26473e2e4a00af43e28a0ddf9002e5062a7d0940429e5efb6e5513a8abcb75c android.hardwar
b056e1defab4071584214584057d0bc73a613081bf1152590549649d4582c13c android.hardware.wifi@1.1::IWifiChip
# ABI preserving changes to HALs during Android O MR1 (Final Set)
2d833aeed0cd1d59437aca210be590a953cf32bcb6683cd63d089762a643fb49 android.hardware.radio@1.0::IRadioResponse
05aa3de6130a9788fdb6f4d3cc57c3ea90f067e77a5e09d6a772ec7f6bca33d2 android.hardware.radio@1.1::IRadioResponse
# HALs released in Android O MR1 (Final Set)

11
radio/1.0/IRadioResponse.hal
View File

@@ -1190,6 +1190,7 @@ interface IRadioResponse {
* RadioError:REQUEST_NOT_SUPPORTED
* RadioError:NO_RESOURCES
* RadioError:CANCELLED
* RadioError:SIM_ABSENT
*/
oneway setSuppServiceNotificationsResponse(RadioResponseInfo info);
@@ -1295,6 +1296,7 @@ interface IRadioResponse {
* RadioError:INVALID_ARGUMENTS
* RadioError:MODEM_ERR
* RadioError:REQUEST_NOT_SUPPORTED
* RadioError:SIM_ABSENT
*/
oneway sendEnvelopeResponse(RadioResponseInfo info, string commandResponse);
@@ -1312,6 +1314,7 @@ interface IRadioResponse {
* RadioError:CANCELLED
* RadioError:INVALID_MODEM_STATE
* RadioError:REQUEST_NOT_SUPPORTED
* RadioError:SIM_ABSENT
*/
oneway sendTerminalResponseToSimResponse(RadioResponseInfo info);
@@ -1329,6 +1332,7 @@ interface IRadioResponse {
* RadioError:NO_RESOURCES
* RadioError:CANCELLED
* RadioError:REQUEST_NOT_SUPPORTED
* RadioError:SIM_ABSENT
*/
oneway handleStkCallSetupRequestFromSimResponse(RadioResponseInfo info);
@@ -1425,6 +1429,7 @@ interface IRadioResponse {
* RadioError:REQUEST_NOT_SUPPORTED
* RadioError:NO_RESOURCES
* RadioError:CANCELLED
* RadioError:SIM_ABSENT
*/
oneway setLocationUpdatesResponse(RadioResponseInfo info);
@@ -1459,6 +1464,7 @@ interface IRadioResponse {
* RadioError:OPERATION_NOT_ALLOWED
* RadioError:NO_RESOURCES
* RadioError:CANCELLED
* RadioError:SIM_ABSENT
*/
oneway setCdmaRoamingPreferenceResponse(RadioResponseInfo info);
@@ -1477,6 +1483,7 @@ interface IRadioResponse {
* RadioError:REQUEST_NOT_SUPPORTED
* RadioError:NO_RESOURCES
* RadioError:CANCELLED
* RadioError:SIM_ABSENT
*/
oneway getCdmaRoamingPreferenceResponse(RadioResponseInfo info, CdmaRoamingType type);
@@ -1801,6 +1808,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);
@@ -1896,6 +1904,7 @@ interface IRadioResponse {
* RadioError:REQUEST_NOT_SUPPORTED
* RadioError:NO_RESOURCES
* RadioError:CANCELLED
* RadioError:SIM_ABSENT
*/
oneway exitEmergencyCallbackModeResponse(RadioResponseInfo info);
@@ -1991,6 +2000,7 @@ interface IRadioResponse {
* RadioError:NO_RESOURCES
* RadioError:CANCELLED
* RadioError:REQUEST_NOT_SUPPORTED
* RadioError:SIM_ABSENT
*/
oneway getCdmaSubscriptionSourceResponse(RadioResponseInfo info, CdmaSubscriptionSource source);
@@ -2008,6 +2018,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);
}
}