commit 18e2fb9b360b294dc6f8ec3694d27138b49f2b23
author android-build-team Robot <android-build-team-robot@google.com> Tue Aug 14 03:11:42 2018 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Tue Aug 14 03:11:42 2018 +0000
tree 4fb7a561df802711b87e005e3a757699076e8412
parent c27980f4541859392d0a240ebefdf7834064be91
parent 14c80dad1a2f3c60e8732b87f234fe8effddd0ca

Snap for 4951295 from 14c80dad1a2f3c60e8732b87f234fe8effddd0ca to pi-qpr1-release

Change-Id: I80d543734e623c9bd46ccdfd87f603935cf62122

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}));
         }
     }
 }