commit cb518b4bdb6e73f79ed8c46a4d33614d3fd67d90
author Aaron Tsai <tsaiaaron@google.com> Fri Jun 04 10:05:32 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jun 04 10:05:32 2021 +0000
tree 6d2075e045116dc4f3861fbf85d7ff7e4c6d299b
parent 7c6dbf8015ab88ea2869317b71e1bd8c622c7d20
parent e11aa2f83b9caa029f129da5dda9163cb74f9ca5

Allow REQUEST_NOT_SUPPORTED for HAL interface updateSimPhonebookRecords am: ef8351b217 am: 0853ce31a2 am: e11aa2f83b

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

Change-Id: I75486da2210340980229e752f9bc2d93cedaa8c5

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) {