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

Commit c546e365 authored by Shuo Qian's avatar Shuo Qian Committed by Automerger Merge Worker
Browse files

Merge "Add REQUEST_NOT_SUPPORTED in case 5G RAN is not supported in the device" am: 89d91f80 

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1552699

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I95538685aba9ad6e2d38e8dbd5285a80ce326c23
parents f4866e5b 89d91f80

radio/1.5/vts/functional/radio_hidl_hal_api.cpp

+18 −3
Original line number Original line 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",

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

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

          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",

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

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

          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",

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

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

          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}));

}

}





/*

/*