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

Commit 876c00cd authored by Yomna Nasser's avatar Yomna Nasser Committed by Automerger Merge Worker
Browse files

Merge "Check API values only if modem supports APIs" into main am: 5cc7f046 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3171379



Change-Id: I04eeca58a3116f014c8f80b391761cf91b4fcf74
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2fd1bd29 5cc7f046

radio/aidl/vts/radio_network_test.cpp

+37 −32
Original line number Diff line number Diff line
@@ -2494,6 +2494,7 @@ TEST_P(RadioNetworkTest, setCellularIdentifierTransparencyEnabled) { 
                                 {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE,

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



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

        // Assert the value has changed

        serial = GetRandomSerialNumber();

        ndk::ScopedAStatus res = radio_network->isCellularIdentifierTransparencyEnabled(serial);
@@ -2508,11 +2509,13 @@ TEST_P(RadioNetworkTest, setCellularIdentifierTransparencyEnabled) { 
        EXPECT_EQ(valueToSet, radioRsp_network->isCellularIdentifierTransparencyEnabled);



        // Reset original state

    radio_network->setCellularIdentifierTransparencyEnabled(serial, originalTransparencySetting);

        radio_network->setCellularIdentifierTransparencyEnabled(serial,

                                                                originalTransparencySetting);

        EXPECT_EQ(std::cv_status::no_timeout, wait());

        EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_network->rspInfo.type);

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

    }

}



/*

 * Test IRadioNetwork.setSecurityAlgorithmsUpdatedEnabled for the response returned.
@@ -2547,6 +2550,7 @@ TEST_P(RadioNetworkTest, setSecurityAlgorithmsUpdatedEnabled) { 
                                 {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE,

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



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

        // Assert the value has changed

        serial = GetRandomSerialNumber();

        ndk::ScopedAStatus res = radio_network->isSecurityAlgorithmsUpdatedEnabled(serial);
@@ -2566,6 +2570,7 @@ TEST_P(RadioNetworkTest, setSecurityAlgorithmsUpdatedEnabled) { 
        EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_network->rspInfo.type);

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

    }

}



/**

 * Test IRadioNetwork.isSecurityAlgorithmsUpdatedEnabled for the response returned.