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

Commit 378bd90e authored by Nagendra Prasad Nagarle Basavaraju's avatar Nagendra Prasad Nagarle Basavaraju
Browse files

[DO NOT MERGE] VTS setGetAllowedNetworkTypesBitmap handle "LTE + LTE_CA" response 

Handle RIL reporting response for getAllowedNetworkTypesBitmap() with
"LTE_CA" responses until Android T.

Bug: 308538353
Test: atest VtsHalRadioTargetTest , Device test @ b/308538353#comment29
Change-Id: I1916422c88ac6dad4a9d0777b32182b599e9c30c
parent e3e212e7

radio/aidl/vts/radio_network_test.cpp

+10 −0
Original line number Original line Diff line number Diff line
@@ -85,6 +85,11 @@ void RadioNetworkTest::stopNetworkScan() { 
TEST_P(RadioNetworkTest, setGetAllowedNetworkTypesBitmap) {

TEST_P(RadioNetworkTest, setGetAllowedNetworkTypesBitmap) {

    serial = GetRandomSerialNumber();

    serial = GetRandomSerialNumber();





    // get aidl version

    int32_t aidl_version;

    ndk::ScopedAStatus aidl_status = radio_network->getInterfaceVersion(&aidl_version);

    ASSERT_OK(aidl_status);



    // save current value

    // save current value

    radio_network->getAllowedNetworkTypesBitmap(serial);

    radio_network->getAllowedNetworkTypesBitmap(serial);

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

    EXPECT_EQ(std::cv_status::no_timeout, wait());
@@ -120,6 +125,11 @@ TEST_P(RadioNetworkTest, setGetAllowedNetworkTypesBitmap) { 
                 RadioError::INVALID_ARGUMENTS, RadioError::MODEM_ERR,

                 RadioError::INVALID_ARGUMENTS, RadioError::MODEM_ERR,

                 RadioError::REQUEST_NOT_SUPPORTED, RadioError::NO_RESOURCES}));

                 RadioError::REQUEST_NOT_SUPPORTED, RadioError::NO_RESOURCES}));

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

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

            if (aidl_version < 2) {

                radioRsp_network->networkTypeBitmapResponse

                    &= ~static_cast<int32_t>(RadioAccessFamily::LTE_CA);

            }



            // verify we get the value we set

            // verify we get the value we set

            ASSERT_EQ(radioRsp_network->networkTypeBitmapResponse, allowedNetworkTypesBitmap);

            ASSERT_EQ(radioRsp_network->networkTypeBitmapResponse, allowedNetworkTypesBitmap);

        }

        }