commit 57c9e5fc377fe854d48ddbec249a7bc2c7ae634e
author sqian <shuoq@google.com> Mon Jul 16 10:04:49 2018 -0700
committer Shuo Qian <shuoq@google.com> Mon Jul 16 21:20:47 2018 +0000
tree f45d7c1dad2cc7a611ea457c5d9e0fe27d04d648
parent 375ff6a3a7a0e2d60360fc68e4900535f2422ec7
parent ccda8d62963b62e80fe1e303c16e75ee9fa274d8

resolve merge conflicts of ccda8d62963b62e80fe1e303c16e75ee9fa274d8 to pi-dev

Test: I solemnly swear I tested this conflict resolution.
Bug: 72075328
Change-Id: I8c993cd2fa95c961dc7f976b5bd85a2826b42889

radio/1.0/vts/functional/radio_hidl_hal_misc.cpp

diff --git a/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp b/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp
index bc03cf1..24d9944 100644
--- a/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp
+++ b/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp
@@ -694,9 +694,10 @@
     EXPECT_EQ(serial, radioRsp->rspInfo.serial);
 
     if (cardStatus.cardState == CardState::ABSENT) {
-        ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error,
-                                     {RadioError::INTERNAL_ERR, RadioError::LCE_NOT_SUPPORTED,
-                                      RadioError::RADIO_NOT_AVAILABLE, RadioError::SIM_ABSENT}));
+        ASSERT_TRUE(CheckAnyOfErrors(
+            radioRsp->rspInfo.error,
+            {RadioError::INTERNAL_ERR, RadioError::LCE_NOT_SUPPORTED,
+             RadioError::RADIO_NOT_AVAILABLE, RadioError::SIM_ABSENT, RadioError::NONE}));
     }
 }
 
@@ -730,10 +731,10 @@
     EXPECT_EQ(serial, radioRsp->rspInfo.serial);
 
     if (cardStatus.cardState == CardState::ABSENT) {
-        ASSERT_TRUE(CheckAnyOfErrors(
-            radioRsp->rspInfo.error,
-            {RadioError::NONE, RadioError::INTERNAL_ERR, RadioError::RADIO_NOT_AVAILABLE},
-            CHECK_OEM_ERROR));
+        ASSERT_TRUE(CheckAnyOfErrors(radioRsp->rspInfo.error,
+                                     {RadioError::NONE, RadioError::INTERNAL_ERR,
+                                      RadioError::RADIO_NOT_AVAILABLE, RadioError::SIM_ABSENT},
+                                     CHECK_OEM_ERROR));
     }
 }