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

Commit 3bc635e7 authored by Grant Menke's avatar Grant Menke
Browse files

Updated VTS getSimultaneousCallingSupport test. 

This CL updates the getSimultaneousCallingSupport VTS test to ensure that REQUEST_NOT_SUPPORTED is not returned and that enabledLogicalSlots is set to an empty array by default for the default CF impl.

Test: VtsHalRadioTargetTest
Bug: 311495663
Change-Id: Ie382c14a19951bb69c7b7db4056f0e9dabc27685
parent f162180e

radio/aidl/vts/radio_config_response.cpp

+2 −1
Original line number Diff line number Diff line
@@ -41,8 +41,9 @@ ndk::ScopedAStatus RadioConfigResponse::getPhoneCapabilityResponse( 
}



ndk::ScopedAStatus RadioConfigResponse::getSimultaneousCallingSupportResponse(

        const RadioResponseInfo& info, const std::vector<int32_t>& /* enabledLogicalSlots */) {

        const RadioResponseInfo& info, const std::vector<int32_t>& enabledLogicalSlots) {

    rspInfo = info;

    currentEnabledLogicalSlots = enabledLogicalSlots;

    parent_config.notify(info.serial);

    return ndk::ScopedAStatus::ok();

}

radio/aidl/vts/radio_config_test.cpp

+8 −1
Original line number Diff line number Diff line
@@ -150,10 +150,17 @@ TEST_P(RadioConfigTest, getSimultaneousCallingSupport) { 
    ALOGI("getSimultaneousCallingSupport, rspInfo.error = %s\n",

          toString(radioRsp_config->rspInfo.error).c_str());



    // REQUEST_NOT_SUPPORTED is omitted here because users of the V3 HAL should implement this

    // method and return at least an empty array

    ASSERT_TRUE(CheckAnyOfErrors(

            radioRsp_config->rspInfo.error,

            {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::INTERNAL_ERR,

            RadioError::MODEM_ERR, RadioError::REQUEST_NOT_SUPPORTED}));

            RadioError::MODEM_ERR}));



    if (radioRsp_config->rspInfo.error == RadioError ::NONE) {

        // The size of enabledLogicalSLots should be 0 or a positive number:

        EXPECT_GE(radioRsp_config->currentEnabledLogicalSlots.size(), 0);

    }

}



/*

radio/aidl/vts/radio_config_utils.h

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ class RadioConfigResponse : public BnRadioConfigResponse { 
    PhoneCapability phoneCap;

    bool modemReducedFeatureSet1;

    std::vector<SimSlotStatus> simSlotStatus;

    std::vector<int32_t> currentEnabledLogicalSlots;



    virtual ndk::ScopedAStatus getSimSlotsStatusResponse(

            const RadioResponseInfo& info, const std::vector<SimSlotStatus>& slotStatus) override;