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

Commit 66b8d373 authored by liuxiangjun's avatar liuxiangjun Committed by Automerger Merge Worker
Browse files

Remove the SIM card status condition check and add accepted possible errors am: 8877018d 

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



Change-Id: I006618e3722a9fd36d2ed67786547666d841cffa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 67755270 8877018d

radio/aidl/vts/radio_network_test.cpp

+6 −13
Original line number Diff line number Diff line
@@ -1167,19 +1167,12 @@ TEST_P(RadioNetworkTest, setNetworkSelectionModeManual) { 
    EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_network->rspInfo.type);

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



    if (cardStatus.cardState == CardStatus::STATE_ABSENT) {

    ASSERT_TRUE(CheckAnyOfErrors(

            radioRsp_network->rspInfo.error,

                {RadioError::NONE, RadioError::ILLEGAL_SIM_OR_ME, RadioError::INVALID_ARGUMENTS,

                 RadioError::INVALID_STATE, RadioError::RADIO_NOT_AVAILABLE, RadioError::NO_MEMORY,

                 RadioError::INTERNAL_ERR, RadioError::SYSTEM_ERR, RadioError::CANCELLED}));

    } else if (cardStatus.cardState == CardStatus::STATE_PRESENT) {

        ASSERT_TRUE(CheckAnyOfErrors(

                radioRsp_network->rspInfo.error,

                {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::INVALID_ARGUMENTS,

                 RadioError::INVALID_STATE, RadioError::NO_MEMORY, RadioError::INTERNAL_ERR,

                 RadioError::SYSTEM_ERR, RadioError::CANCELLED}));

    }

            {RadioError::NONE, RadioError::ILLEGAL_SIM_OR_ME, RadioError::RADIO_NOT_AVAILABLE,

             RadioError::INVALID_ARGUMENTS, RadioError::INVALID_STATE, RadioError::NO_MEMORY,

             RadioError::INTERNAL_ERR, RadioError::SYSTEM_ERR, RadioError::CANCELLED,

             RadioError::MODEM_ERR, RadioError::OPERATION_NOT_ALLOWED, RadioError::NO_RESOURCES}));

}



/*