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

Commit 6a85d76a authored by sqian's avatar sqian Committed by Shuo Qian
Browse files

resolve merge conflicts of eb0f7cdc to oc-dr1-dev 

Test: I solemnly swear I tested this conflict resolution.
Bug: 72075328
Change-Id: I58b1bb905b0126297ba651e9ecff65878f6d49c7
Merged-In: I8c993cd2fa95c961dc7f976b5bd85a2826b42889
parents ea4ab32f eb0f7cdc

radio/1.0/vts/functional/radio_hidl_hal_misc.cpp

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

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

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

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

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

                    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) {

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

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

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

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

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

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

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

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

    }

    }

}

}