commit 1f3d0a68a4583d81accc27c005de054abfde5fc0
author Amit Mahajan <amitmahajan@google.com> Tue Jun 12 15:23:39 2018 -0700
committer Hsin-Yi Chen <hsinyichen@google.com> Wed Aug 29 01:42:18 2018 +0000
tree d357466ffd8f8b290172fe116c0f71145bd508fc
parent 3c233d344c270bb4d2b73e34b55672caeb53b70d

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
Merged-In: If36083b7832706a50805932e8ba08e4eb397f3fe
(cherry picked from commit 817848e59e18334a30f623ef143cf182716fd3fa)

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 2d9d6d0..2670d96 100644
--- a/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp
+++ b/radio/1.0/vts/functional/radio_hidl_hal_icc.cpp
@@ -192,7 +192,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) {