tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Remove the SIM card status condition check and add accepted possible errors" into android14-tests-dev am: fd06d0a042

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2884867

Change-Id: I0cad16a813fc21bee0b09bd52cdc32ac04cb4857
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2024-04-24 04:16:37 +00:00 committed by Automerger Merge Worker
commit ad8252ded8
1 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
radio/aidl/vts/radio_network_test.cpp
View file

@ -1167,19 +1167,11 @@ TEST_P(RadioNetworkTest, setNetworkSelectionModeManual) {
EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_network->rspInfo.type); EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_network->rspInfo.type);
EXPECT_EQ(serial, radioRsp_network->rspInfo.serial); EXPECT_EQ(serial, radioRsp_network->rspInfo.serial);
if (cardStatus.cardState == CardStatus::STATE_ABSENT) { ASSERT_TRUE(CheckAnyOfErrors(
ASSERT_TRUE(CheckAnyOfErrors( radioRsp_network->rspInfo.error,
radioRsp_network->rspInfo.error, {RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE, RadioError::INVALID_ARGUMENTS,
{RadioError::NONE, RadioError::ILLEGAL_SIM_OR_ME, RadioError::INVALID_ARGUMENTS, RadioError::INVALID_STATE, RadioError::NO_MEMORY, RadioError::INTERNAL_ERR,
RadioError::INVALID_STATE, RadioError::RADIO_NOT_AVAILABLE, RadioError::NO_MEMORY, RadioError::SYSTEM_ERR, RadioError::CANCELLED, RadioError::MODEM_ERR}));
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}));
}
} }
/* /*