commit 2d0ba0f61b720ec0426fe8e544715dd5133e91bd
author sqian <shuoq@google.com> Thu Aug 09 12:51:10 2018 -0700
committer sqian <shuoq@google.com> Mon Aug 13 17:36:54 2018 -0700
tree 9397aa6321d5a39a9109f1f15875bfd673958763
parent 9da8a72744b4f1f80a16fc3da2892aa742ed329c

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

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 73e26d2..0985f4c 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 @@
             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 @@
             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}));
         }
     }
 }