Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 97af8bec authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Return INVALID_ ARGUMENTS is the expected result"

parents 9bf3a092 eddc6dc0

radio/1.0/vts/functional/vts_test_util.cpp

+4 −0
Original line number Diff line number Diff line
@@ -138,3 +138,7 @@ std::cv_status RadioResponseWaiter::wait() { 
    count_--;

    return status;

}



bool isLteConnected(){

    return testing::checkSubstringInCommandOutput("getprop gsm.network.type", "LTE");

}

radio/1.0/vts/functional/vts_test_util.h

+5 −0
Original line number Diff line number Diff line
@@ -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.

 */

radio/1.5/vts/functional/radio_hidl_hal_api.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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 {

radio/aidl/vts/radio_aidl_hal_utils.cpp

+4 −0
Original line number Diff line number Diff line
@@ -227,3 +227,7 @@ void RadioServiceTest::updateSimSlotStatus(int physicalSlotId) { 
        slotStatus = radioConfigRsp->simSlotStatus[physicalSlotId];

    }

}



bool isLteConnected(){

    return testing::checkSubstringInCommandOutput("getprop gsm.network.type", "LTE");

}

radio/aidl/vts/radio_aidl_hal_utils.h

+5 −0
Original line number Diff line number Diff line
@@ -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

 */