summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2024-04-24 20:29:59 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2024-04-24 20:29:59 +0000
commit897317d8b21356f6b28d7f253e9c6b77f56b43bd (patch)
tree8a9d7d9831c711f01b7737b759fe7742baf4bb1a
parentbfd5ee42c7fc58fe4b5a2b25831443a98fb07536 (diff)
parentfd06d0a04224f8e3796377cf9a95713a17b86f30 (diff)
downloadinterfaces-android14-tests-release.tar.gz
Snap for 11759675 from fd06d0a04224f8e3796377cf9a95713a17b86f30 to android14-tests-releaseandroid14-tests-release
Change-Id: I3dc9ee01b57e1252dbfdf9c92c4de908bf408cd9
-rw-r--r--radio/aidl/vts/radio_network_test.cpp18
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}));
}
/*