commit 6a85d76a9e1faf6262b91ebc999d29fe71996acb
author sqian <shuoq@google.com> Tue Jul 17 15:40:09 2018 -0700
committer Shuo Qian <shuoq@google.com> Wed Jul 18 00:22:17 2018 +0000
tree 324f9783cf787d246ed42e8058330f1b43561e9d
parent ea4ab32f97f38941b15d3267c44e1aa1be07bce7
parent eb0f7cdcbfc7235978247ae62bfd07675cdf8c67

resolve merge conflicts of eb0f7cdcbfc7235978247ae62bfd07675cdf8c67 to oc-dr1-dev

Test: I solemnly swear I tested this conflict resolution.
Bug: 72075328
Change-Id: I58b1bb905b0126297ba651e9ecff65878f6d49c7
Merged-In: 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 e450493..2098398 100644
--- a/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp
+++ b/radio/1.0/vts/functional/radio_hidl_hal_misc.cpp
@@ -689,7 +689,8 @@
         ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE ||
                     radioRsp->rspInfo.error == RadioError::LCE_NOT_SUPPORTED ||
                     radioRsp->rspInfo.error == RadioError::INTERNAL_ERR ||
-                    radioRsp->rspInfo.error == RadioError::SIM_ABSENT);
+                    radioRsp->rspInfo.error == RadioError::SIM_ABSENT ||
+                    radioRsp->rspInfo.error == RadioError::NONE);
     }
 }
 
@@ -726,7 +727,8 @@
     if (cardStatus.cardState == CardState::ABSENT) {
         ASSERT_TRUE(radioRsp->rspInfo.error == RadioError::RADIO_NOT_AVAILABLE || CheckOEMError() ||
                     radioRsp->rspInfo.error == RadioError::INTERNAL_ERR ||
-                    radioRsp->rspInfo.error == RadioError::NONE);
+                    radioRsp->rspInfo.error == RadioError::NONE ||
+                    radioRsp->rspInfo.error == RadioError::SIM_ABSENT);
     }
 }