tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Add corresponding error code to fix vts test" into oc-dev

Browse source 
am: 417af3a797

Change-Id: I39238ce6a796bc6981b77ec361f384f0f3f4d173
This commit is contained in:
Shuo Qian 2017-08-01 00:25:23 +00:00 committed by android-build-merger
commit 2ad5aecc2e
2 changed files with 7 additions and 9 deletions
Show stats 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);
}
}