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

Fix setAllowedCarrier

Browse source 
If function is not supported or executed successfully, do not
expect its effect on cardStatus.

Bug: 112008372
Test: run vts
Change-Id: I4532a39af2cfcf0e44eafe29c3c7f6779ae101f5
This commit is contained in:
sqian 2018-07-31 09:23:24 -07:00 committed by Shuo Qian
parent 8e92056837
commit 44b129f728
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

@ -779,20 +779,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);
@ -808,18 +815,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);
}
/*