Merge "Accept NONE as a response for setDataThrottling during VTS."

This commit is contained in:
Treehugger Robot
2021-10-04 17:36:43 +00:00
committed by Gerrit Code Review

View File

@@ -501,7 +501,8 @@ TEST_P(RadioHidlTest_v1_6, setDataThrottling) {
if (getRadioHalCapabilities()) {
ASSERT_TRUE(CheckAnyOfErrors(
radioRsp_v1_6->rspInfo.error,
{::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED}));
{::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED,
::android::hardware::radio::V1_6::RadioError::NONE}));
} else {
ASSERT_TRUE(CheckAnyOfErrors(
radioRsp_v1_6->rspInfo.error,
@@ -523,7 +524,8 @@ TEST_P(RadioHidlTest_v1_6, setDataThrottling) {
if (getRadioHalCapabilities()) {
ASSERT_TRUE(CheckAnyOfErrors(
radioRsp_v1_6->rspInfo.error,
{::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED}));
{::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED,
::android::hardware::radio::V1_6::RadioError::NONE}));
} else {
ASSERT_TRUE(CheckAnyOfErrors(
radioRsp_v1_6->rspInfo.error,
@@ -545,7 +547,8 @@ TEST_P(RadioHidlTest_v1_6, setDataThrottling) {
if (getRadioHalCapabilities()) {
ASSERT_TRUE(CheckAnyOfErrors(
radioRsp_v1_6->rspInfo.error,
{::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED}));
{::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED,
::android::hardware::radio::V1_6::RadioError::NONE}));
} else {
ASSERT_TRUE(CheckAnyOfErrors(
radioRsp_v1_6->rspInfo.error,
@@ -566,7 +569,8 @@ TEST_P(RadioHidlTest_v1_6, setDataThrottling) {
if (getRadioHalCapabilities()) {
ASSERT_TRUE(CheckAnyOfErrors(
radioRsp_v1_6->rspInfo.error,
{::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED}));
{::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED,
::android::hardware::radio::V1_6::RadioError::NONE}));
} else {
ASSERT_TRUE(CheckAnyOfErrors(
radioRsp_v1_6->rspInfo.error,