From a784a1c963b2e70b5dcc3cd77d7771bbfbb86683 Mon Sep 17 00:00:00 2001 From: Jack Nudelman Date: Tue, 28 Sep 2021 14:22:20 -0700 Subject: [PATCH] Accept NONE as a response for setDataThrottling during VTS. Bug: 199809900 Test: b/199809900 Change-Id: I3b71401c28eb2f06c020f549a28ef5970282c855 --- radio/1.6/vts/functional/radio_hidl_hal_api.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/radio/1.6/vts/functional/radio_hidl_hal_api.cpp b/radio/1.6/vts/functional/radio_hidl_hal_api.cpp index 710616eaf1..cd195200ff 100644 --- a/radio/1.6/vts/functional/radio_hidl_hal_api.cpp +++ b/radio/1.6/vts/functional/radio_hidl_hal_api.cpp @@ -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,