commit e5bf3a268e263340138b1118a8ec47ed309715d9
author sqian <shuoq@google.com> Thu Aug 09 12:51:10 2018 -0700
committer Shuo Qian <shuoq@google.com> Tue Aug 14 19:24:17 2018 +0000
tree d7c6fd2be440f4345da09671b9cea84c918a3fdc
parent 248276659c0a650f2b7353c4700e6402b78b4b85

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
Merged-In: I736873b1b181b88f279df7dc1c09e18e0fc76af3
(cherry picked from commit cb9e9d10462cc82ee6e7074f8d4c831b6348b3ea)

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 5042c07..2670d96 100644
--- a/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp
+++ b/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp
@@ -69,7 +69,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}));
         }
     }
 }
@@ -118,7 +119,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}));
         }
     }
 }