commit e0ebcef41b8ddf0372aa69aa36f45c7d8fa5d1f7
author Shuo Qian <shuoq@google.com> Wed Aug 01 18:48:38 2018 -0700
committer android-build-merger <android-build-merger@google.com> Wed Aug 01 18:48:38 2018 -0700
tree e0b2e132deac64ec1b3cb8817c1e840c66ed5a09
parent e9e11768e5168aeef7347d7b3c259d7a43b78088
parent a97a34816355f2556a9e15cc574a74bfb193570d

Merge "Revert "Fixed VTS failure in no SIM case"" into pi-dev am: b471863b21
am: a97a348163

Change-Id: Id8d9c0a2b4c64a3dc522ad236fd466cfc703b7f6

radio/1.2/vts/functional/radio_hidl_hal_api.cpp

diff --git a/radio/1.2/vts/functional/radio_hidl_hal_api.cpp b/radio/1.2/vts/functional/radio_hidl_hal_api.cpp
index a9865e5..0215e80 100644
--- a/radio/1.2/vts/functional/radio_hidl_hal_api.cpp
+++ b/radio/1.2/vts/functional/radio_hidl_hal_api.cpp
@@ -650,9 +650,8 @@
     if (cardStatus.base.cardState == CardState::ABSENT) {
         ASSERT_TRUE(CheckAnyOfErrors(
             radioRsp_v1_2->rspInfo.error,
-            {RadioError::NONE, RadioError::SIM_ABSENT, RadioError::RADIO_NOT_AVAILABLE,
-             RadioError::INVALID_ARGUMENTS, RadioError::OP_NOT_ALLOWED_BEFORE_REG_TO_NW,
-             RadioError::REQUEST_NOT_SUPPORTED}));
+            {RadioError::SIM_ABSENT, RadioError::RADIO_NOT_AVAILABLE, RadioError::INVALID_ARGUMENTS,
+             RadioError::OP_NOT_ALLOWED_BEFORE_REG_TO_NW, RadioError::REQUEST_NOT_SUPPORTED}));
     } else if (cardStatus.base.cardState == CardState::PRESENT) {
         ASSERT_TRUE(CheckAnyOfErrors(
             radioRsp_v1_2->rspInfo.error,