diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-04-24 03:55:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-04-24 03:55:47 +0000 |
| commit | fd06d0a04224f8e3796377cf9a95713a17b86f30 (patch) | |
| tree | 8a9d7d9831c711f01b7737b759fe7742baf4bb1a | |
| parent | 8d3cb52eadb737e3cee092a6e1596462d51b3cb3 (diff) | |
| parent | 4b7f0175f1556daf2ed1d85ca724aac64fb67c4f (diff) | |
| download | interfaces-fd06d0a04224f8e3796377cf9a95713a17b86f30.tar.gz | |
Merge "Remove the SIM card status condition check and add accepted possible errors" into android14-tests-devandroid14-tests-dev
| -rw-r--r-- | radio/aidl/vts/radio_network_test.cpp | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/radio/aidl/vts/radio_network_test.cpp b/radio/aidl/vts/radio_network_test.cpp index f316a34554..df3fb1e8a8 100644 --- a/radio/aidl/vts/radio_network_test.cpp +++ b/radio/aidl/vts/radio_network_test.cpp @@ -1167,19 +1167,11 @@ TEST_P(RadioNetworkTest, setNetworkSelectionModeManual) { 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})); } /* |