commit 617c98b537bcc19a5e1acc70d49b17a124920e20
author sqian <shuoq@google.com> Fri Jun 15 14:24:31 2018 -0700
committer sqian <shuoq@google.com> Fri Jun 22 16:32:07 2018 -0700
tree 4d1fcf35160b2ca845b962f5b9a2b7c9d8d255e9
parent de56860a9b182ad7227f4032ec0602c6936fcfcd

Add REQUEST_NOT_SUPPORTED for changeIccPinForApp and changeIccPin2ForApp

Bug: 110037298
Test: run vts -m VtsHalRadioV1_0Target
Change-Id: Iaba800814c5a6950d086a2f105714d01fdaa14a4
Merged-In: Iaba800814c5a6950d086a2f105714d01fdaa14a4
(cherry picked from commit 7470cbd04dbb90ec4a6481d08db54c6a8c5f2efd)

radio/1.0/vts/functional/radio_hidl_hal_icc.cpp

diff --git a/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp b/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp
index 47498b0..d38bc23 100644
--- a/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp
+++ b/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp
@@ -136,7 +136,9 @@
             EXPECT_EQ(std::cv_status::no_timeout, wait());
             EXPECT_EQ(serial, radioRsp->rspInfo.serial);
             EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
-            EXPECT_EQ(RadioError::PASSWORD_INCORRECT, radioRsp->rspInfo.error);
+            ASSERT_TRUE(CheckAnyOfErrors(
+                radioRsp->rspInfo.error,
+                {RadioError::PASSWORD_INCORRECT, RadioError::REQUEST_NOT_SUPPORTED}));
         }
     }
 }
@@ -159,7 +161,9 @@
             EXPECT_EQ(std::cv_status::no_timeout, wait());
             EXPECT_EQ(serial, radioRsp->rspInfo.serial);
             EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
-            EXPECT_EQ(RadioError::PASSWORD_INCORRECT, radioRsp->rspInfo.error);
+            ASSERT_TRUE(CheckAnyOfErrors(
+                radioRsp->rspInfo.error,
+                {RadioError::PASSWORD_INCORRECT, RadioError::REQUEST_NOT_SUPPORTED}));
         }
     }
 }