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

Commit e799f22a 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-mr1-dev 

am: de8b8c2a

Change-Id: I53da8ef12020129098e2b049d42c8a538b854efe
parents 4a2b89b2 de8b8c2a

radio/1.0/vts/functional/radio_hidl_hal_data.cpp

+8 −2
Original line number Diff line number Diff line
@@ -98,7 +98,10 @@ TEST_F(RadioHidlTest, deactivateDataCall) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



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

        EXPECT_EQ(RadioError::INVALID_CALL_ID, radioRsp->rspInfo.error);

        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::RADIO_NOT_AVAILABLE);

    }

}
@@ -220,6 +223,9 @@ TEST_F(RadioHidlTest, setDataProfile) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



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

        // TODO(shuoq): Will add error check when we know the expected error from QC

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

                    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

+15 −13
Original line number Diff line number Diff line
@@ -754,7 +754,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 */
@@ -768,7 +769,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);

    }

}