Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix RadioConfig 1.1 vts test

Browse Source 
am: 9c93b3500a

Change-Id: Ic8ed4d3324987d6d95b9153f19db60152ab0bc3c
This commit is contained in:
Tim Lin
2019-06-13 22:30:18 -07:00
committed by android-build-merger
parent 0e70902d34 9c93b3500a
commit d391e404ed
3 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
radio/config/1.1/vts/functional/radio_config_hidl_hal_api.cpp
View File

@@ -130,7 +130,8 @@ TEST_F(RadioConfigHidlTest, setPreferredDataModem) {
EXPECT_EQ(std::cv_status::no_timeout, wait());
EXPECT_EQ(RadioResponseType::SOLICITED, radioConfigRsp->rspInfo.type);
EXPECT_EQ(serial, radioConfigRsp->rspInfo.serial);
ALOGI("getModemsConfig, rspInfo.error = %s\n", toString(radioConfigRsp->rspInfo.error).c_str());
ALOGI("setPreferredDataModem, rspInfo.error = %s\n",
toString(radioConfigRsp->rspInfo.error).c_str());
ASSERT_TRUE(CheckAnyOfErrors(
radioConfigRsp->rspInfo.error,
@@ -149,7 +150,8 @@ TEST_F(RadioConfigHidlTest, setPreferredDataModem_invalidArgument) {
EXPECT_EQ(std::cv_status::no_timeout, wait());
EXPECT_EQ(RadioResponseType::SOLICITED, radioConfigRsp->rspInfo.type);
EXPECT_EQ(serial, radioConfigRsp->rspInfo.serial);
ALOGI("getModemsConfig, rspInfo.error = %s\n", toString(radioConfigRsp->rspInfo.error).c_str());
ALOGI("setPreferredDataModem, rspInfo.error = %s\n",
toString(radioConfigRsp->rspInfo.error).c_str());
ASSERT_TRUE(CheckAnyOfErrors(radioConfigRsp->rspInfo.error,
{RadioError::INVALID_ARGUMENTS, RadioError::RADIO_NOT_AVAILABLE,

5
radio/config/1.1/vts/functional/radio_config_hidl_hal_test.cpp
View File

@@ -34,9 +34,6 @@ void RadioConfigHidlTest::SetUp() {
count_ = 0;
radioConfig->setResponseFunctions(radioConfigRsp, nullptr);
EXPECT_EQ(RadioResponseType::SOLICITED, radioConfigRsp->rspInfo.type);
EXPECT_EQ(serial, radioConfigRsp->rspInfo.serial);
EXPECT_EQ(RadioError::NONE, radioConfigRsp->rspInfo.error);
}
/*
@@ -66,4 +63,4 @@ std::cv_status RadioConfigHidlTest::wait() {
}
count_--;
return status;
}
}

13
radio/config/1.1/vts/functional/radio_config_response.cpp
View File

@@ -38,16 +38,21 @@ Return<void> RadioConfigResponse::getPhoneCapabilityResponse(
return Void();
}
Return<void> RadioConfigResponse::setPreferredDataModemResponse(
const RadioResponseInfo& /* info */) {
Return<void> RadioConfigResponse::setPreferredDataModemResponse(const RadioResponseInfo& info) {
rspInfo = info;
parent.notify(info.serial);
return Void();
}
Return<void> RadioConfigResponse::getModemsConfigResponse(const RadioResponseInfo& /* info */,
Return<void> RadioConfigResponse::getModemsConfigResponse(const RadioResponseInfo& info,
const ModemsConfig& /* mConfig */) {
rspInfo = info;
parent.notify(info.serial);
return Void();
}
Return<void> RadioConfigResponse::setModemsConfigResponse(const RadioResponseInfo& /* info */) {
Return<void> RadioConfigResponse::setModemsConfigResponse(const RadioResponseInfo& info) {
rspInfo = info;
parent.notify(info.serial);
return Void();
}