commit 17fec3625d7094fd68c4a43966ddc2eb513658e4
author Shuo Qian <shuoq@google.com> Thu Jul 26 22:37:50 2018 +0000
committer Shuo Qian <shuoq@google.com> Fri Jul 27 18:13:21 2018 +0000
tree 3930c1e07cff50f37901642957316344ba2e03d4
parent 431eb118f84de14c94ec18f887197944ec17e712

Revert "Fixed VTS failure in no SIM case"

Since the EMERGENCY-type APN is a must set in the radio
setupDataCall request for modem to perform Emergency call,
and the given VTS test case does not set that emergency bit,
I think modem should treat the request as a normal call
request, and should not return "NONE" for no-sim.

This reverts commit 431eb118f84de14c94ec18f887197944ec17e712.

Reason for revert: after further discussion, NONE
is not acceptable given the test case.

Bug: 109767888
Change-Id: I3d1cc96120d53a9be0ae5059c26b091bf82dc352

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 11a73c3..9284fd8 100644
--- a/radio/1.2/vts/functional/radio_hidl_hal_api.cpp
+++ b/radio/1.2/vts/functional/radio_hidl_hal_api.cpp
@@ -621,9 +621,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,