Merge "Add corresponding error code to fix vts test" into oreo-vts-dev
This commit is contained in:
commit
91c4ebbd6f
2 changed files with 7 additions and 9 deletions
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue