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

Merge "Fix setAllowedCarrier"

Browse source
This commit is contained in:
Treehugger Robot 2018-08-14 19:19:19 +00:00 committed by Gerrit Code Review
commit ed8cf648cd
1 changed files with 30 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -778,20 +778,27 @@ TEST_F(RadioHidlTest, setAllowedCarriers) {
{RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED}));
}
/* Setting to carrier restriction needs some time */
updateSimCardStatus();
auto startTime = std::chrono::system_clock::now();
while (cardStatus.cardState != CardState::RESTRICTED &&
std::chrono::duration_cast<chrono::seconds>(std::chrono::system_clock::now() - startTime)
.count() < 10) {
/* Set 2 seconds as interval to check card status */
sleep(2);
if (radioRsp->rspInfo.error == RadioError::NONE) {
/* Setting to carrier restriction needs some time */
updateSimCardStatus();
auto startTime = std::chrono::system_clock::now();
while (cardStatus.cardState != CardState::RESTRICTED &&
std::chrono::duration_cast<chrono::seconds>(std::chrono::system_clock::now() -
startTime)
.count() < 10) {
/* Set 2 seconds as interval to check card status */
sleep(2);
updateSimCardStatus();
}
EXPECT_EQ(CardState::RESTRICTED, cardStatus.cardState);
}
EXPECT_EQ(CardState::RESTRICTED, cardStatus.cardState);
sleep(10);
/* Reset back to no carrier restriction */
/**
* Another test case of the API to cover to allow carrier.
* If the API is supported, this is also used to reset to no carrier restriction
* status for cardStatus.
*/
memset(&carriers, 0, sizeof(carriers));
carriers.allowedCarriers.resize(0);
carriers.excludedCarriers.resize(0);
@ -807,18 +814,21 @@ TEST_F(RadioHidlTest, setAllowedCarriers) {
{RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED}));
}
/* Resetting back to no carrier restriction needs some time */
updateSimCardStatus();
startTime = std::chrono::system_clock::now();
while (cardStatus.cardState == CardState::RESTRICTED &&
std::chrono::duration_cast<chrono::seconds>(std::chrono::system_clock::now() - startTime)
.count() < 10) {
/* Set 2 seconds as interval to check card status */
sleep(2);
if (radioRsp->rspInfo.error == RadioError::NONE) {
/* Resetting back to no carrier restriction needs some time */
updateSimCardStatus();
auto startTime = std::chrono::system_clock::now();
while (cardStatus.cardState == CardState::RESTRICTED &&
std::chrono::duration_cast<chrono::seconds>(std::chrono::system_clock::now() -
startTime)
.count() < 10) {
/* Set 2 seconds as interval to check card status */
sleep(2);
updateSimCardStatus();
}
EXPECT_NE(CardState::RESTRICTED, cardStatus.cardState);
sleep(10);
}
EXPECT_NE(CardState::RESTRICTED, cardStatus.cardState);
sleep(10);
}
/*