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

Commit 16ad551f authored by yinxu's avatar yinxu Committed by android-build-merger
Browse files

Merge "Add the error code "OPERATION_NOT_ALLOWED" and log the error." into oc-dr1-dev 

am: 3a57cca5

Change-Id: I6a1aeea07e64b4748151f62ae4827132eba32781
parents 2187f58f 3a57cca5

radio/1.1/vts/functional/radio_hidl_hal_api.cpp

+6 −1
Original line number Diff line number Diff line
@@ -62,10 +62,12 @@ TEST_F(RadioHidlTest_v1_1, startNetworkScan) { 
    EXPECT_EQ(serial, radioRsp_v1_1->rspInfo.serial);



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

        ALOGI("startNetworkScan, rspInfo.error = %d\n", (int32_t)radioRsp_v1_1->rspInfo.error);

        ASSERT_TRUE(radioRsp_v1_1->rspInfo.error == RadioError::NONE ||

                    radioRsp_v1_1->rspInfo.error == RadioError::SIM_ABSENT ||

                    radioRsp_v1_1->rspInfo.error == RadioError::INVALID_ARGUMENTS ||

                    radioRsp_v1_1->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);

                    radioRsp_v1_1->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED ||

                    radioRsp_v1_1->rspInfo.error == RadioError::OPERATION_NOT_ALLOWED);

    }

}
@@ -85,6 +87,8 @@ TEST_F(RadioHidlTest_v1_1, startNetworkScan_InvalidArgument) { 
    EXPECT_EQ(serial, radioRsp_v1_1->rspInfo.serial);



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

        ALOGI("startNetworkScan_InvalidArgument, rspInfo.error = %d\n",

              (int32_t)radioRsp_v1_1->rspInfo.error);

        ASSERT_TRUE(radioRsp_v1_1->rspInfo.error == RadioError::INVALID_ARGUMENTS ||

                    radioRsp_v1_1->rspInfo.error == RadioError::SIM_ABSENT ||

                    radioRsp_v1_1->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);
@@ -103,6 +107,7 @@ TEST_F(RadioHidlTest_v1_1, stopNetworkScan) { 
    EXPECT_EQ(serial, radioRsp_v1_1->rspInfo.serial);



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

        ALOGI("stopNetworkScan rspInfo.error = %d\n", (int32_t)radioRsp_v1_1->rspInfo.error);

        ASSERT_TRUE(radioRsp_v1_1->rspInfo.error == RadioError::NONE ||

                    radioRsp_v1_1->rspInfo.error == RadioError::SIM_ABSENT ||

                    radioRsp_v1_1->rspInfo.error == RadioError::REQUEST_NOT_SUPPORTED);