tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Accept NONE as a response for setDataThrottling during VTS." am: 83398c025f am: bfeb55a6f4 am: fe628882bc am: 11312c1620

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

Change-Id: Idb38de0f14065e06f46741b810051412b98084d9
This commit is contained in:
Treehugger Robot 2021-10-04 18:33:48 +00:00 committed by Automerger Merge Worker
commit 7fab484bfc
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
radio/1.6/vts/functional/radio_hidl_hal_api.cpp
View file

@ -515,7 +515,8 @@ TEST_P(RadioHidlTest_v1_6, setDataThrottling) {
if (getRadioHalCapabilities()) { if (getRadioHalCapabilities()) {
ASSERT_TRUE(CheckAnyOfErrors( ASSERT_TRUE(CheckAnyOfErrors(
radioRsp_v1_6->rspInfo.error, 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 { } else {
ASSERT_TRUE(CheckAnyOfErrors( ASSERT_TRUE(CheckAnyOfErrors(
radioRsp_v1_6->rspInfo.error, radioRsp_v1_6->rspInfo.error,
@ -537,7 +538,8 @@ TEST_P(RadioHidlTest_v1_6, setDataThrottling) {
if (getRadioHalCapabilities()) { if (getRadioHalCapabilities()) {
ASSERT_TRUE(CheckAnyOfErrors( ASSERT_TRUE(CheckAnyOfErrors(
radioRsp_v1_6->rspInfo.error, 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 { } else {
ASSERT_TRUE(CheckAnyOfErrors( ASSERT_TRUE(CheckAnyOfErrors(
radioRsp_v1_6->rspInfo.error, radioRsp_v1_6->rspInfo.error,
@ -559,7 +561,8 @@ TEST_P(RadioHidlTest_v1_6, setDataThrottling) {
if (getRadioHalCapabilities()) { if (getRadioHalCapabilities()) {
ASSERT_TRUE(CheckAnyOfErrors( ASSERT_TRUE(CheckAnyOfErrors(
radioRsp_v1_6->rspInfo.error, 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 { } else {
ASSERT_TRUE(CheckAnyOfErrors( ASSERT_TRUE(CheckAnyOfErrors(
radioRsp_v1_6->rspInfo.error, radioRsp_v1_6->rspInfo.error,
@ -580,7 +583,8 @@ TEST_P(RadioHidlTest_v1_6, setDataThrottling) {
if (getRadioHalCapabilities()) { if (getRadioHalCapabilities()) {
ASSERT_TRUE(CheckAnyOfErrors( ASSERT_TRUE(CheckAnyOfErrors(
radioRsp_v1_6->rspInfo.error, 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 { } else {
ASSERT_TRUE(CheckAnyOfErrors( ASSERT_TRUE(CheckAnyOfErrors(
radioRsp_v1_6->rspInfo.error, radioRsp_v1_6->rspInfo.error,