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

Commit 181f064c authored by Yomna Nasser's avatar Yomna Nasser Committed by Automerger Merge Worker
Browse files

Merge "VTS fix for getAllowedNetworkTypesBitmap and setAllowedNetworkTypesBitmap" am: b1e7ca32 

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

Change-Id: I678cc1a2bd31fe0143a281d031b62b2b9bc22a56
parents fd648831 b1e7ca32

radio/1.6/vts/functional/radio_hidl_hal_api.cpp

+22 −34
Original line number Original line Diff line number Diff line
@@ -32,14 +32,8 @@ TEST_P(RadioHidlTest_v1_6, setAllowedNetworkTypesBitmap) { 
    EXPECT_EQ(std::cv_status::no_timeout, wait());

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

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

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

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

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



    ASSERT_TRUE(

    if (getRadioHalCapabilities()) {

            CheckAnyOfErrors(radioRsp_v1_6->rspInfo.error,

        ASSERT_TRUE(CheckAnyOfErrors(

                radioRsp_v1_6->rspInfo.error,

                {::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED}));

    } else {

        ASSERT_TRUE(CheckAnyOfErrors(

                radioRsp_v1_6->rspInfo.error,

                             {::android::hardware::radio::V1_6::RadioError::NONE,

                             {::android::hardware::radio::V1_6::RadioError::NONE,

                              ::android::hardware::radio::V1_6::RadioError::RADIO_NOT_AVAILABLE,

                              ::android::hardware::radio::V1_6::RadioError::RADIO_NOT_AVAILABLE,

                              ::android::hardware::radio::V1_6::RadioError::OPERATION_NOT_ALLOWED,

                              ::android::hardware::radio::V1_6::RadioError::OPERATION_NOT_ALLOWED,
@@ -47,9 +41,9 @@ TEST_P(RadioHidlTest_v1_6, setAllowedNetworkTypesBitmap) { 
                              ::android::hardware::radio::V1_6::RadioError::INTERNAL_ERR,

                              ::android::hardware::radio::V1_6::RadioError::INTERNAL_ERR,

                              ::android::hardware::radio::V1_6::RadioError::INVALID_ARGUMENTS,

                              ::android::hardware::radio::V1_6::RadioError::INVALID_ARGUMENTS,

                              ::android::hardware::radio::V1_6::RadioError::MODEM_ERR,

                              ::android::hardware::radio::V1_6::RadioError::MODEM_ERR,

                              ::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED,

                              ::android::hardware::radio::V1_6::RadioError::NO_RESOURCES}));

                              ::android::hardware::radio::V1_6::RadioError::NO_RESOURCES}));

}

}

}





/*

/*

 * Test IRadio.getAllowedNetworkTypesBitmap for the response returned.

 * Test IRadio.getAllowedNetworkTypesBitmap for the response returned.
@@ -74,12 +68,6 @@ TEST_P(RadioHidlTest_v1_6, getAllowedNetworkTypesBitmap) { 
        EXPECT_EQ(std::cv_status::no_timeout, wait());

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

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

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

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

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



        if (getRadioHalCapabilities()) {

            ASSERT_TRUE(CheckAnyOfErrors(

                    radioRsp_v1_6->rspInfo.error,

                    {::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED}));

        } else {

        ASSERT_TRUE(CheckAnyOfErrors(

        ASSERT_TRUE(CheckAnyOfErrors(

                radioRsp_v1_6->rspInfo.error,

                radioRsp_v1_6->rspInfo.error,

                {::android::hardware::radio::V1_6::RadioError::NONE,

                {::android::hardware::radio::V1_6::RadioError::NONE,
@@ -89,10 +77,10 @@ TEST_P(RadioHidlTest_v1_6, getAllowedNetworkTypesBitmap) { 
                 ::android::hardware::radio::V1_6::RadioError::INTERNAL_ERR,

                 ::android::hardware::radio::V1_6::RadioError::INTERNAL_ERR,

                 ::android::hardware::radio::V1_6::RadioError::INVALID_ARGUMENTS,

                 ::android::hardware::radio::V1_6::RadioError::INVALID_ARGUMENTS,

                 ::android::hardware::radio::V1_6::RadioError::MODEM_ERR,

                 ::android::hardware::radio::V1_6::RadioError::MODEM_ERR,

                 ::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED,

                 ::android::hardware::radio::V1_6::RadioError::NO_RESOURCES}));

                 ::android::hardware::radio::V1_6::RadioError::NO_RESOURCES}));

    }

    }

}

}

}





/*

/*

 * Test IRadio.setupDataCall_1_6() for the response returned.

 * Test IRadio.setupDataCall_1_6() for the response returned.