Merge "Fix VTS errors of the network scan API" into oc-dr1-dev am: 6bba7c9ca4

am: d9cdb2181d

Change-Id: I8d29e4778235d7bc30a0b2c541007854e64a9214
This commit is contained in:
Ying Xu 2017-07-26 18:30:58 +00:00 committed by android-build-merger
commit 836df4c7c3

View file

@ -63,7 +63,8 @@ TEST_F(RadioHidlTest_v1_1, startNetworkScan) {
if (cardStatus.cardState == CardState::ABSENT) {
ASSERT_TRUE(radioRsp_v1_1->rspInfo.error == RadioError::NONE ||
radioRsp_v1_1->rspInfo.error == RadioError::SIM_ABSENT ||
radioRsp_v1_1->rspInfo.error == RadioError::INVALID_ARGUMENTS);
radioRsp_v1_1->rspInfo.error == RadioError::INVALID_ARGUMENTS ||
radioRsp_v1_1->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);
}
}
@ -84,7 +85,8 @@ TEST_F(RadioHidlTest_v1_1, startNetworkScan_InvalidArgument) {
if (cardStatus.cardState == CardState::ABSENT) {
ASSERT_TRUE(radioRsp_v1_1->rspInfo.error == RadioError::INVALID_ARGUMENTS ||
radioRsp_v1_1->rspInfo.error == RadioError::SIM_ABSENT);
radioRsp_v1_1->rspInfo.error == RadioError::SIM_ABSENT ||
radioRsp_v1_1->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);
}
}
@ -101,6 +103,7 @@ TEST_F(RadioHidlTest_v1_1, stopNetworkScan) {
if (cardStatus.cardState == CardState::ABSENT) {
ASSERT_TRUE(radioRsp_v1_1->rspInfo.error == RadioError::NONE ||
radioRsp_v1_1->rspInfo.error == RadioError::SIM_ABSENT);
radioRsp_v1_1->rspInfo.error == RadioError::SIM_ABSENT ||
radioRsp_v1_1->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);
}
}