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

Commit 89d91f80 authored by Shuo Qian's avatar Shuo Qian Committed by Gerrit Code Review
Browse files

Merge "Add REQUEST_NOT_SUPPORTED in case 5G RAN is not supported in the device"

parents 1c15423d 763b1447

radio/1.5/vts/functional/radio_hidl_hal_api.cpp

+18 −3
Original line number Diff line number Diff line
@@ -236,7 +236,12 @@ TEST_P(RadioHidlTest_v1_5, setSignalStrengthReportingCriteria_1_5_NGRAN_SSRSRP) 


    ALOGI("setSignalStrengthReportingCriteria_1_5_NGRAN_SSRSRP, rspInfo.error = %s\n",

          toString(radioRsp_v1_5->rspInfo.error).c_str());

    ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_5->rspInfo.error, {RadioError::NONE}));



    // Allow REQUEST_NOT_SUPPORTED because some non-5G device may not support NGRAN for

    // setSignalStrengthReportingCriteria_1_5()

    ASSERT_TRUE(

            CheckAnyOfErrors(radioRsp_v1_5->rspInfo.error,

                             {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED}));

}



/*
@@ -261,7 +266,12 @@ TEST_P(RadioHidlTest_v1_5, setSignalStrengthReportingCriteria_1_5_NGRAN_SSRSRQ) 


    ALOGI("setSignalStrengthReportingCriteria_1_5_NGRAN_SSRSRQ, rspInfo.error = %s\n",

          toString(radioRsp_v1_5->rspInfo.error).c_str());

    ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_5->rspInfo.error, {RadioError::NONE}));



    // Allow REQUEST_NOT_SUPPORTED because some non-5G device may not support NGRAN for

    // setSignalStrengthReportingCriteria_1_5()

    ASSERT_TRUE(

            CheckAnyOfErrors(radioRsp_v1_5->rspInfo.error,

                             {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED}));

}



/*
@@ -307,7 +317,12 @@ TEST_P(RadioHidlTest_v1_5, setSignalStrengthReportingCriteria_1_5_NGRAN_SSSINR) 


    ALOGI("setSignalStrengthReportingCriteria_1_5_NGRAN_SSSINR, rspInfo.error = %s\n",

          toString(radioRsp_v1_5->rspInfo.error).c_str());

    ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_5->rspInfo.error, {RadioError::NONE}));



    // Allow REQUEST_NOT_SUPPORTED because some non-5G device may not support NGRAN for

    // setSignalStrengthReportingCriteria_1_5()

    ASSERT_TRUE(

            CheckAnyOfErrors(radioRsp_v1_5->rspInfo.error,

                             {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED}));

}



/*