Return INVALID_ ARGUMENTS is the expected result

For devices not in LTE service, the vts test returns INVALID_ ARGUMENTS is an expected result

Bug:289756066

Test:
VtsHalRadioV1_5TargetTest  PerInstance/RadioHidlTest_v1_5#startNetworkScan/0_slot1
VtsHalRadioV1_5TargetTest  PerInstance/RadioHidlTest_v1_5#startNetworkScan/1_slot2

Change-Id: I873d51e089b27aa0cc0dc9f5f25fd8ffaa4d8f40
Signed-off-by: liuxiangjun <liuxiangjun3@xiaomi.com>
Merged-In: I873d51e089b27aa0cc0dc9f5f25fd8ffaa4d8f40
This commit is contained in:
liuxiangjun 2023-07-03 10:06:57 +08:00 committed by Hung-ying Tyan
parent b68968f638
commit 7ddd478150
6 changed files with 20 additions and 2 deletions

View file

@ -138,3 +138,7 @@ std::cv_status RadioResponseWaiter::wait() {
count_--;
return status;
}
bool isLteConnected(){
return testing::checkSubstringInCommandOutput("getprop gsm.network.type", "LTE");
}

View file

@ -104,6 +104,11 @@ bool isVoiceEmergencyOnly(RegState state);
*/
bool isVoiceInService(RegState state);
/*
* Check if device is in Lte Connected status.
*/
bool isLteConnected();
/**
* Used when waiting for an asynchronous response from the HAL.
*/

View file

@ -597,7 +597,7 @@ TEST_P(RadioHidlTest_v1_5, startNetworkScan) {
} else if (cardStatus.base.base.base.cardState == CardState::PRESENT) {
// Modems support 3GPP RAT family need to
// support scanning requests combined with some parameters.
if (deviceSupportsFeature(FEATURE_TELEPHONY_GSM)) {
if (deviceSupportsFeature(FEATURE_TELEPHONY_GSM) && isLteConnected()) {
ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_5->rspInfo.error,
{RadioError::NONE, RadioError::OPERATION_NOT_ALLOWED}));
} else {

View file

@ -227,3 +227,7 @@ void RadioServiceTest::updateSimSlotStatus(int physicalSlotId) {
slotStatus = radioConfigRsp->simSlotStatus[physicalSlotId];
}
}
bool isLteConnected(){
return testing::checkSubstringInCommandOutput("getprop gsm.network.type", "LTE");
}

View file

@ -128,6 +128,11 @@ bool isVoiceInService(RegState state);
*/
bool isServiceValidForDeviceConfiguration(std::string& serviceName);
/*
* Check if device is in Lte Connected status.
*/
bool isLteConnected();
/**
* RadioServiceTest base class
*/

View file

@ -858,7 +858,7 @@ TEST_P(RadioNetworkTest, startNetworkScan) {
if (cardStatus.cardState == CardStatus::STATE_ABSENT) {
ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error, {RadioError::SIM_ABSENT}));
} else if (cardStatus.cardState == CardStatus::STATE_PRESENT) {
if (deviceSupportsFeature(FEATURE_TELEPHONY_GSM)) {
if (deviceSupportsFeature(FEATURE_TELEPHONY_GSM) && isLteConnected()) {
// Modems support 3GPP RAT family need to
// support scanning requests combined with some parameters.
ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error,