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

Commit 2ad5aecc authored by Shuo Qian's avatar Shuo Qian Committed by android-build-merger
Browse files

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

am: 417af3a7

Change-Id: I39238ce6a796bc6981b77ec361f384f0f3f4d173
parents 3f60c009 417af3a7

radio/1.0/vts/functional/radio_hidl_hal_data.cpp

+5 −5
Original line number Diff line number Diff line
@@ -104,8 +104,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);

    }

}
@@ -230,8 +230,8 @@ 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::RADIO_NOT_AVAILABLE ||

                    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 Diff line number Diff line
@@ -763,8 +763,7 @@ TEST_F(RadioHidlTest, setAllowedCarriers) { 


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

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

                    radioRsp->rspInfo.error ==

                        RadioError::REQUEST_NOT_SUPPORTED);

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

    }



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


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

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

                    radioRsp->rspInfo.error ==

                        RadioError::REQUEST_NOT_SUPPORTED);

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

    }

}