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

Merge "Fix more radio VTS test." into oc-dev

Browse source
This commit is contained in:
TreeHugger Robot 2017-05-25 17:06:28 +00:00 committed by Android (Google) Code Review
commit 3cc7c4e314
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
radio/1.0/vts/functional/radio_hidl_hal_misc.cpp
View file

@ -143,15 +143,17 @@ TEST_F(RadioHidlTest, getAvailableNetworks) {
radio->getAvailableNetworks(++serial);
EXPECT_EQ(std::cv_status::no_timeout, wait());
EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
EXPECT_EQ(serial, radioRsp->rspInfo.serial);
ASSERT_TRUE(radioRsp->rspInfo.type == RadioResponseType::SOLICITED ||
radioRsp->rspInfo.type == RadioResponseType::SOLICITED_ACK_EXP);
if (cardStatus.cardState == CardState::ABSENT) {
ASSERT_TRUE(CheckGeneralError() ||
radioRsp->rspInfo.error == RadioError::NONE ||
radioRsp->rspInfo.error == RadioError::DEVICE_IN_USE ||
radioRsp->rspInfo.error == RadioError::CANCELLED ||
radioRsp->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED);
ASSERT_TRUE(
CheckGeneralError() || radioRsp->rspInfo.error == RadioError::NONE ||
radioRsp->rspInfo.error == RadioError::DEVICE_IN_USE ||
radioRsp->rspInfo.error == RadioError::CANCELLED ||
radioRsp->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED ||
radioRsp->rspInfo.error == RadioError::MODEM_ERR);
}
}

2
radio/1.0/vts/functional/radio_hidl_hal_utils.h
View file

@ -80,7 +80,7 @@ using ::android::hardware::Return;
using ::android::hardware::Void;
using ::android::sp;
#define TIMEOUT_PERIOD 40
#define TIMEOUT_PERIOD 65
#define RADIO_SERVICE_NAME "slot1"
class RadioHidlTest;