From 9d0f0635b993294d50c8b0341aecde274c57ccf8 Mon Sep 17 00:00:00 2001 From: Shuo Qian Date: Thu, 26 Jul 2018 22:37:50 +0000 Subject: [PATCH] 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 Merged-In: I3d1cc96120d53a9be0ae5059c26b091bf82dc352 (cherry picked from commit 17fec3625d7094fd68c4a43966ddc2eb513658e4) --- radio/1.2/vts/functional/radio_hidl_hal_api.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 a9865e53de..0215e80902 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 @@ TEST_F(RadioHidlTest_v1_2, setupDataCall_1_2) { 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,