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 corresponding error code to fix vts test" into oc-dev

Browse Source
This commit is contained in:
Shuo Qian
2017-08-01 00:19:48 +00:00
committed by Android (Google) Code Review
parent 90e68d31cf 1e5b695016
commit 417af3a797
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
radio/1.0/vts/functional/radio_hidl_hal_data.cpp
View File

@@ -104,8 +104,8 @@ TEST_F(RadioHidlTest, deactivateDataCall) {
if (cardStatus.cardState == CardState::ABSENT) {
ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||
radioRsp->rspInfo.error == RadioError::INVALID_CALL_ID ||
radioRsp->rspInfo.error == RadioError::SIM_ABSENT ||
CheckOEMError());
radioRsp->rspInfo.error == RadioError::SIM_ABSENT || CheckOEMError() ||
radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE);
}
}
@@ -230,8 +230,8 @@ TEST_F(RadioHidlTest, setDataProfile) {
if (cardStatus.cardState == CardState::ABSENT) {
ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE ||
radioRsp->rspInfo.error ==
RadioError::RADIO_NOT_AVAILABLE ||
radioRsp->rspInfo.error == RadioError::SIM_ABSENT);
radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE ||
radioRsp->rspInfo.error == RadioError::SIM_ABSENT ||
radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);
}
}

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

@@ -763,8 +763,7 @@ TEST_F(RadioHidlTest, setAllowedCarriers) {
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);
}
/* Reset back to no carrier restriction */
@@ -779,8 +778,7 @@ TEST_F(RadioHidlTest, setAllowedCarriers) {
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);
}
}