From 2d0ba0f61b720ec0426fe8e544715dd5133e91bd Mon Sep 17 00:00:00 2001 From: sqian Date: Thu, 9 Aug 2018 12:51:10 -0700 Subject: [PATCH] Check INVALID_SIM_STATE for sim permanent lock status PUK1 and PUK2 can get permanent blocked when it inputs wrong passwords more than 10 times. Bug: 111211929 Test: sanity Change-Id: I736873b1b181b88f279df7dc1c09e18e0fc76af3 --- radio/1.0/vts/functional/radio_hidl_hal_icc.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 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 73e26d2d91..0985f4ca74 100644 --- a/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp +++ b/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp @@ -67,7 +67,8 @@ TEST_F(RadioHidlTest, supplyIccPukForApp) { 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::INVALID_SIM_STATE})); } } } @@ -113,7 +114,8 @@ TEST_F(RadioHidlTest, supplyIccPuk2ForApp) { 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::INVALID_SIM_STATE})); } } }