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 431eb118f8.

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 17fec3625d)
This commit is contained in:
Shuo Qian 2018-07-26 22:37:50 +00:00
parent 0084639ada
commit 9d0f0635b9

View file

@ -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,