From 3c608789e0c1ca483bb19857a95554a4b166faf8 Mon Sep 17 00:00:00 2001 From: sqian Date: Thu, 12 Jul 2018 16:30:24 -0700 Subject: [PATCH] Add REQUEST_NOT_SUPPORTED for pin and pin2 Icc VTS Bug: 111222834 Test: sanity Change-Id: Ia3b96e83d6173c2c80bdbf7763a876883b167af9 Merged-In: Ia3b96e83d6173c2c80bdbf7763a876883b167af9 (cherry picked from commit c0a06f34c88cf9dc017be6178113b35c3c7fc67e) --- radio/1.0/vts/functional/radio_hidl_hal_icc.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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 308a882a89..5042c071e8 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp @@ -44,7 +44,9 @@ TEST_F(RadioHidlTest, supplyIccPinForApp) { 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})); } } } @@ -90,8 +92,10 @@ TEST_F(RadioHidlTest, supplyIccPin2ForApp) { EXPECT_EQ(std::cv_status::no_timeout, wait()); EXPECT_EQ(serial, radioRsp->rspInfo.serial); EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type); - ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error, - {RadioError::PASSWORD_INCORRECT, RadioError::SIM_PUK2})); + ASSERT_TRUE( + CheckAnyOfErrors(radioRsp->rspInfo.error, + {RadioError::PASSWORD_INCORRECT, RadioError::REQUEST_NOT_SUPPORTED, + RadioError::SIM_PUK2})); } } }