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

Commit a20caf77 authored by Shuo Qian's avatar Shuo Qian Committed by Android (Google) Code Review
Browse files

Merge "Add corresponding error code to fix vts test" into oc-dr1-dev

parents e93e38a9 ce1f89d9

radio/1.0/vts/functional/radio_hidl_hal_data.cpp

+4 −2
Original line number Diff line number Diff line
@@ -100,7 +100,8 @@ TEST_F(RadioHidlTest, deactivateDataCall) { 
    if (cardStatus.cardState == CardState::ABSENT) {

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

                    radioRsp->rspInfo.error == RadioError::INVALID_CALL_ID ||

                    radioRsp->rspInfo.error == RadioError::SIM_ABSENT || CheckOEMError());

                    radioRsp->rspInfo.error == RadioError::SIM_ABSENT || CheckOEMError() ||

                    radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE);

    }

}
@@ -225,6 +226,7 @@ TEST_F(RadioHidlTest, setDataProfile) { 
    if (cardStatus.cardState == CardState::ABSENT) {

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

                    radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE ||

                    radioRsp->rspInfo.error == RadioError::SIM_ABSENT);

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

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

    }

}

radio/1.0/vts/functional/radio_hidl_hal_misc.cpp

+5 −3
Original line number Diff line number Diff line
@@ -757,7 +757,8 @@ TEST_F(RadioHidlTest, setAllowedCarriers) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



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

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || CheckGeneralError());

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

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

    }



    /* Reset back to no carrier restriction */
@@ -771,7 +772,8 @@ TEST_F(RadioHidlTest, setAllowedCarriers) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



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

        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::NONE || CheckGeneralError());

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

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

    }

}