From 763b144799d661ae629fa200e04ce40bb0c6c771 Mon Sep 17 00:00:00 2001 From: sqian Date: Fri, 15 Jan 2021 21:56:21 +0000 Subject: [PATCH] Add REQUEST_NOT_SUPPORTED in case 5G RAN is not supported in the device Test: vts Bug: 177215423 Change-Id: I35f09c0b8e22eb9464c0ca1c11225f62d1916286 --- .../1.5/vts/functional/radio_hidl_hal_api.cpp | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/radio/1.5/vts/functional/radio_hidl_hal_api.cpp b/radio/1.5/vts/functional/radio_hidl_hal_api.cpp index 7166654814..0b49b36927 100644 --- a/radio/1.5/vts/functional/radio_hidl_hal_api.cpp +++ b/radio/1.5/vts/functional/radio_hidl_hal_api.cpp @@ -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})); } /*