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

Merge "VTS: Fix IRadio.setAllowedCarriers and IRadio.nvResetConfig" into oc-dev

Browse Source 
am: eca8d114bf

Change-Id: I33e926f4ecd0314b4554ca9d90104f8afda773eb
This commit is contained in:
Jayachandran Chinnakkannu
2017-05-05 22:29:14 +00:00
committed by android-build-merger
parent 858ba19de2 eca8d114bf
commit 1a8f5c3595
1 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
radio/1.0/vts/functional/radio_hidl_hal_misc.cpp
View File

@@ -556,7 +556,7 @@ TEST_F(RadioHidlTest, nvWriteCdmaPrl) {
TEST_F(RadioHidlTest, nvResetConfig) {
int serial = 1;
radio->nvResetConfig(++serial, ResetNvType::RELOAD);
radio->nvResetConfig(++serial, ResetNvType::ERASE);
EXPECT_EQ(std::cv_status::no_timeout, wait());
EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
EXPECT_EQ(serial, radioRsp->rspInfo.serial);
@@ -733,6 +733,8 @@ TEST_F(RadioHidlTest, getModemActivityInfo) {
TEST_F(RadioHidlTest, setAllowedCarriers) {
int serial = 1;
CarrierRestrictions carriers;
/* Carrier restriction with one carrier */
memset(&carriers, 0, sizeof(carriers));
carriers.allowedCarriers.resize(1);
carriers.excludedCarriers.resize(0);
@@ -749,6 +751,20 @@ TEST_F(RadioHidlTest, setAllowedCarriers) {
if (cardStatus.cardState == CardState::ABSENT) {
ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE);
}
/* Reset back to no carrier restriction */
memset(&carriers, 0, sizeof(carriers));
carriers.allowedCarriers.resize(0);
carriers.excludedCarriers.resize(0);
radio->setAllowedCarriers(++serial, true, carriers);
EXPECT_EQ(std::cv_status::no_timeout, wait());
EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
EXPECT_EQ(serial, radioRsp->rspInfo.serial);
if (cardStatus.cardState == CardState::ABSENT) {
ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE);
}
}
/*
@@ -816,4 +832,4 @@ TEST_F(RadioHidlTest, setSimCardPower) {
ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE
|| radioRsp->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);
}
}
}