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

Commit 57c9e5fc authored by sqian's avatar sqian Committed by Shuo Qian
Browse files

resolve merge conflicts of ccda8d62 to pi-dev 

Test: I solemnly swear I tested this conflict resolution.
Bug: 72075328
Change-Id: I8c993cd2fa95c961dc7f976b5bd85a2826b42889
parents 375ff6a3 ccda8d62

radio/1.0/vts/functional/radio_hidl_hal_misc.cpp

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



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

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error,

        ASSERT_TRUE(CheckAnyOfErrors(

            radioRsp->rspInfo.error,

            {RadioError::INTERNAL_ERR, RadioError::LCE_NOT_SUPPORTED,

                                      RadioError::RADIO_NOT_AVAILABLE, RadioError::SIM_ABSENT}));

             RadioError::RADIO_NOT_AVAILABLE, RadioError::SIM_ABSENT, RadioError::NONE}));

    }

}
@@ -730,9 +731,9 @@ TEST_F(RadioHidlTest, pullLceData) { 
    EXPECT_EQ(serial, radioRsp->rspInfo.serial);



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

        ASSERT_TRUE(CheckAnyOfErrors(

            radioRsp->rspInfo.error,

            {RadioError::NONE, RadioError::INTERNAL_ERR, RadioError::RADIO_NOT_AVAILABLE},

        ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error,

                                     {RadioError::NONE, RadioError::INTERNAL_ERR,

                                      RadioError::RADIO_NOT_AVAILABLE, RadioError::SIM_ABSENT},

                                     CHECK_OEM_ERROR));

    }

}