From ef8351b217303577914d44fa882930109c9ffcef Mon Sep 17 00:00:00 2001 From: Aaron Tsai Date: Wed, 2 Jun 2021 01:18:12 +0800 Subject: [PATCH] Allow REQUEST_NOT_SUPPORTED for HAL interface updateSimPhonebookRecords Bug: 188309710 Test: atest VtsHalRadioV1_6TargetTest Change-Id: I70fec63e495959272b3d95a97050723faee8b1c8 --- radio/1.6/vts/functional/radio_hidl_hal_api.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 422e91cf45..4fd13e1d13 100644 --- a/radio/1.6/vts/functional/radio_hidl_hal_api.cpp +++ b/radio/1.6/vts/functional/radio_hidl_hal_api.cpp @@ -851,7 +851,11 @@ TEST_F(RadioHidlTest_v1_6, updateSimPhonebookRecords) { EXPECT_EQ(std::cv_status::no_timeout, wait()); EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_6->rspInfo.type); EXPECT_EQ(serial, radioRsp_v1_6->rspInfo.serial); - EXPECT_EQ(::android::hardware::radio::V1_6::RadioError::NONE, radioRsp_v1_6->rspInfo.error); + ASSERT_TRUE(CheckAnyOfErrors( + radioRsp_v1_6->rspInfo.error, + {::android::hardware::radio::V1_6::RadioError::NONE, + ::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED}, + CHECK_GENERAL_ERROR)); if(pbCapacity.maxAdnRecords > 0 && pbCapacity.usedAdnRecords < pbCapacity.maxAdnRecords) {