commit 2c36d907169ac050a1d2bd116695e54581701c6f
author Amit Mahajan <amitmahajan@google.com> Tue Jun 12 15:23:39 2018 -0700
committer Amit Mahajan <amitmahajan@google.com> Thu Jun 14 17:18:38 2018 +0000
tree 9174a7c907e7e0b191ebc8f12a00db2da70477fa
parent 25080b1fff1d69da6b404205f6cb6a61eab1865b

Allow general errors for getImsiForApp().

This is to match it with other 1.0 tests where general errors are
allowed. For newer tests we have decided to not allow these errors,
but a failure for this old test is reported when run with SIM
present.

Test: run vts -m VtsHalRadioV1_0Target
Bug: 109889468
Change-Id: If36083b7832706a50805932e8ba08e4eb397f3fe

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 e6837ce..47498b0 100644
--- a/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp
+++ b/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp
@@ -180,7 +180,8 @@
             EXPECT_EQ(std::cv_status::no_timeout, wait());
             EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp->rspInfo.type);
             EXPECT_EQ(serial, radioRsp->rspInfo.serial);
-            EXPECT_EQ(RadioError::NONE, radioRsp->rspInfo.error);
+            ASSERT_TRUE(
+                CheckAnyOfErrors(radioRsp->rspInfo.error, {RadioError::NONE}, CHECK_GENERAL_ERROR));
 
             // IMSI (MCC+MNC+MSIN) is at least 6 digits, but not more than 15
             if (radioRsp->rspInfo.error == RadioError::NONE) {