commit 9a0dab8fb7f93d2d6c9fb632aa4c5f3e4085e969
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jun 07 03:57:55 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Jun 07 03:57:55 2021 +0000
tree c1fc333f50237fed79334b25894aeec2f6250064
parent 7a0ef6264554ba93e5b761d5fd7d3d72dfb98318
parent c0490422cf7efda9f1018a019a6d4a7544b55d3f

Merge "Allow REQUEST_NOT_SUPPORTED for HAL interface updateSimPhonebookRecords" into sc-dev

radio/1.6/vts/functional/radio_hidl_hal_api.cpp

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 de18279..35abb15 100644
--- a/radio/1.6/vts/functional/radio_hidl_hal_api.cpp
+++ b/radio/1.6/vts/functional/radio_hidl_hal_api.cpp
@@ -865,7 +865,11 @@
         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) {