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

Commit d906b670 authored by yomna's avatar yomna Committed by Gil Cukierman
Browse files

Update null cipher VTS to handle AIDL version 2 and 3 separately 

In AIDL version 2, APIs were optional. In 3 and newer, they are
required.

Bug: b/311536993
Test: atest VtsHalRadioTargetTest
Change-Id: I5325aa6d3505afa5df3d6b295a4ffd62a075da16
parent 836b255e

radio/aidl/vts/radio_network_test.cpp

+20 −6
Original line number Diff line number Diff line
@@ -2372,9 +2372,16 @@ TEST_P(RadioNetworkTest, setNullCipherAndIntegrityEnabled) { 
    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_network->rspInfo.type);

    EXPECT_EQ(serial, radioRsp_network->rspInfo.serial);



    if (aidl_version >= 3 && deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {

        ASSERT_TRUE(CheckAnyOfErrors(

                radioRsp_network->rspInfo.error,

                {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::MODEM_ERR}));

    } else {

        // For aidl_version 2, API is optional

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error,

                                     {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE,

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

    }

}



/**
@@ -2406,9 +2413,16 @@ TEST_P(RadioNetworkTest, isNullCipherAndIntegrityEnabled) { 
    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_network->rspInfo.type);

    EXPECT_EQ(serial, radioRsp_network->rspInfo.serial);



    if (aidl_version >= 3 && deviceSupportsFeature(FEATURE_TELEPHONY_RADIO_ACCESS)) {

        ASSERT_TRUE(CheckAnyOfErrors(

                radioRsp_network->rspInfo.error,

                {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::MODEM_ERR}));

    } else {

        // For aidl_version 2, API is optional

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error,

                                     {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE,

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

    }

}



TEST_P(RadioNetworkTest, isCellularIdentifierTransparencyEnabled) {