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

Commit 52e70ec9 authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Merge "Add REQUEST_NOT_SUPPORTED and INVALID_ARGUMENTS to be allowed." am:... 

Merge "Add REQUEST_NOT_SUPPORTED and INVALID_ARGUMENTS to be allowed." am: 86bc1500 am: bc00ee0a

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



Change-Id: Ia3723dd46fd71cf42d8dcc7b577b2bd2e4f6def7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3c7c189a bc00ee0a

radio/1.5/vts/functional/radio_hidl_hal_api.cpp

+10 −5
Original line number Original line Diff line number Diff line
@@ -595,12 +595,17 @@ TEST_P(RadioHidlTest_v1_5, startNetworkScan) { 
    if (cardStatus.base.base.base.cardState == CardState::ABSENT) {

    if (cardStatus.base.base.base.cardState == CardState::ABSENT) {

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_5->rspInfo.error, {RadioError::SIM_ABSENT}));

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_5->rspInfo.error, {RadioError::SIM_ABSENT}));

    } else if (cardStatus.base.base.base.cardState == CardState::PRESENT) {

    } else if (cardStatus.base.base.base.cardState == CardState::PRESENT) {

        // OPERATION_NOT_ALLOWED should not be allowed; however, some vendors do

        // Modems have "GSM" rat scan need to

        // not support the required manual GSM search functionality. This is

        // tracked in b/112206766. Modems have "GSM" rat scan need to

        // support scanning requests combined with some parameters.

        // support scanning requests combined with some parameters.

        if (deviceSupportsFeature(FEATURE_TELEPHONY_GSM)) {

            ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_5->rspInfo.error,

            ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_5->rspInfo.error,

                                         {RadioError::NONE, RadioError::OPERATION_NOT_ALLOWED}));

                                         {RadioError::NONE, RadioError::OPERATION_NOT_ALLOWED}));

        } else {

            ASSERT_TRUE(CheckAnyOfErrors(

                    radioRsp_v1_5->rspInfo.error,

                    {RadioError::NONE, RadioError::OPERATION_NOT_ALLOWED,

                     RadioError::REQUEST_NOT_SUPPORTED, RadioError::INVALID_ARGUMENTS}));

        }

    }

    }





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

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

radio/aidl/vts/radio_network_test.cpp

+9 −2
Original line number Original line Diff line number Diff line
@@ -862,8 +862,15 @@ TEST_P(RadioNetworkTest, startNetworkScan) { 
        // not support the required manual GSM search functionality. This is

        // not support the required manual GSM search functionality. This is

        // tracked in b/112206766. Modems have "GSM" rat scan need to

        // tracked in b/112206766. Modems have "GSM" rat scan need to

        // support scanning requests combined with some parameters.

        // support scanning requests combined with some parameters.

        if (deviceSupportsFeature(FEATURE_TELEPHONY_GSM)) {

            ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error,

            ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error,

                                         {RadioError::NONE, RadioError::OPERATION_NOT_ALLOWED}));

                                         {RadioError::NONE, RadioError::OPERATION_NOT_ALLOWED}));

        } else {

            ASSERT_TRUE(CheckAnyOfErrors(

                    radioRsp_network->rspInfo.error,

                    {RadioError::NONE, RadioError::OPERATION_NOT_ALLOWED, RadioError::NONE,

                     RadioError::INVALID_ARGUMENTS, RadioError::REQUEST_NOT_SUPPORTED}));

        }

    }

    }





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

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