commit 4b7f0175f1556daf2ed1d85ca724aac64fb67c4f
author liuxiangjun <liuxiangjun3@xiaomi.com> Wed Dec 20 19:57:15 2023 +0800
committer Jack Yu <jackyu@google.com> Thu Mar 07 02:41:51 2024 +0000
tree 36351018d89144c21d1ae1c221ebca9da3eca45e
parent 8351f33b2b5a4be356605251e2ea26c3c03d946f

Remove the SIM card status condition check and add accepted possible errors

For devices not in LTE service, the vts test returns MODEM_ERR is an expected result

Bug:317314512

Test:
VtsHalRadioTargetTest
PerInstance/RadioNetworkTest#setNetworkSelectionModeManual/0_android_hardware_radio_network_IRadioNetwork_slot1
PerInstance/RadioNetworkTest#setNetworkSelectionModeManual/1_android_hardware_radio_network_IRadioNetwork_slot2

Merged-In: I75414ba18be93707310cace21b52508edfc33a20
Change-Id: I75414ba18be93707310cace21b52508edfc33a20
Signed-off-by: liuxiangjun <liuxiangjun3@xiaomi.com>

radio/aidl/vts/radio_network_test.cpp

diff --git a/radio/aidl/vts/radio_network_test.cpp b/radio/aidl/vts/radio_network_test.cpp
index f316a34..df3fb1e 100644
--- a/radio/aidl/vts/radio_network_test.cpp
+++ b/radio/aidl/vts/radio_network_test.cpp
@@ -1167,19 +1167,11 @@
     EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_network->rspInfo.type);
     EXPECT_EQ(serial, radioRsp_network->rspInfo.serial);
 
-    if (cardStatus.cardState == CardStatus::STATE_ABSENT) {
-        ASSERT_TRUE(CheckAnyOfErrors(
-                radioRsp_network->rspInfo.error,
-                {RadioError::NONE, RadioError::ILLEGAL_SIM_OR_ME, RadioError::INVALID_ARGUMENTS,
-                 RadioError::INVALID_STATE, RadioError::RADIO_NOT_AVAILABLE, RadioError::NO_MEMORY,
-                 RadioError::INTERNAL_ERR, RadioError::SYSTEM_ERR, RadioError::CANCELLED}));
-    } else if (cardStatus.cardState == CardStatus::STATE_PRESENT) {
-        ASSERT_TRUE(CheckAnyOfErrors(
-                radioRsp_network->rspInfo.error,
-                {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::INVALID_ARGUMENTS,
-                 RadioError::INVALID_STATE, RadioError::NO_MEMORY, RadioError::INTERNAL_ERR,
-                 RadioError::SYSTEM_ERR, RadioError::CANCELLED}));
-    }
+    ASSERT_TRUE(CheckAnyOfErrors(
+            radioRsp_network->rspInfo.error,
+            {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::INVALID_ARGUMENTS,
+             RadioError::INVALID_STATE, RadioError::NO_MEMORY, RadioError::INTERNAL_ERR,
+             RadioError::SYSTEM_ERR, RadioError::CANCELLED, RadioError::MODEM_ERR}));
 }
 
 /*