Merge "Add REQUEST_NOT_SUPPORTED in case 5G RAN is not supported in the device" am: 89d91f8064 am: c546e36565 am: 6e62d18290

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaa2b66bad3ffcb2fef3166e92c888e4fc76c9434
This commit is contained in:
Shuo Qian 2021-01-19 22:04:46 +00:00 committed by Automerger Merge Worker
commit 7989ddac9b

View file

@ -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}));
}
/*