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

Commit 898d05a7 authored by sqian's avatar sqian
Browse files

resolve merge conflicts of dfa79a62 to oreo-mr1-vts-dev 

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I10919718b841fdb33ab0e873d1b4bbd787fafcd2
parents c0243f2f dfa79a62

radio/1.0/vts/functional/radio_hidl_hal_misc.cpp

+4 −2
Original line number Diff line number Diff line
@@ -689,7 +689,8 @@ TEST_F(RadioHidlTest, startLceService) { 
        ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE ||

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

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

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

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

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

    }

}
@@ -726,7 +727,8 @@ TEST_F(RadioHidlTest, pullLceData) { 
    if (cardStatus.cardState == CardState::ABSENT) {

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

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

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

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

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

    }

}