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

Commit 417af3a7 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-dev

parents 90e68d31 1e5b6950

radio/1.0/vts/functional/radio_hidl_hal_data.cpp

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

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

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

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

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

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

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

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

                    CheckOEMError());

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

    }

    }

}

}
@@ -230,8 +230,8 @@ TEST_F(RadioHidlTest, setDataProfile) { 




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

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

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

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

                    radioRsp->rspInfo.error ==

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

                        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

+2 −4
Original line number Original line Diff line number Diff line
@@ -763,8 +763,7 @@ TEST_F(RadioHidlTest, setAllowedCarriers) { 




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

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

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

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

                    radioRsp->rspInfo.error ==

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

                        RadioError::REQUEST_NOT_SUPPORTED);

    }

    }





    /* Reset back to no carrier restriction */

    /* Reset back to no carrier restriction */
@@ -779,8 +778,7 @@ TEST_F(RadioHidlTest, setAllowedCarriers) { 




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

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

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

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

                    radioRsp->rspInfo.error ==

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

                        RadioError::REQUEST_NOT_SUPPORTED);

    }

    }

}

}