commit f3d1d3aed3e689db34e06450dd8914d056fb4107
author TreeHugger Robot <treehugger-gerrit@google.com> Thu Jun 14 17:16:03 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 14 17:16:03 2018 +0000
tree 140d030942b469bd84ec8f55ed4428eb1fb694a8
parent 79db3ec849c5f1142a0802dccfff6cbef564ff76
parent 817848e59e18334a30f623ef143cf182716fd3fa

Merge "Allow general errors for getImsiForApp()." into pi-dev

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 b764b13..67e51ea 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) {