commit 93376090d0c3df92f516089ed7f6a992d9428341
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Jun 07 04:15:41 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Jun 07 04:15:41 2021 +0000
tree c1fc333f50237fed79334b25894aeec2f6250064
parent 05e7094433421f550cc2767005fc8ea4613556c5
parent 9a0dab8fb7f93d2d6c9fb632aa4c5f3e4085e969

Merge "Allow REQUEST_NOT_SUPPORTED for HAL interface updateSimPhonebookRecords" into sc-dev am: 9a0dab8fb7

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

Change-Id: I8143238ae60c1c089df8f0886f5771d042d52316

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