From dce4f358f76e4166f8f6fa4a2a93c19fac36c514 Mon Sep 17 00:00:00 2001 From: Nathan Harold Date: Wed, 7 Feb 2024 14:53:55 -0800 Subject: [PATCH] Only check result if getUsageSetting Succeeds Skip checking the result of getUsageSetting if the call to the method returns an error. Bug: 319369513 Test: atest VtsHalRadioTargetTest Change-Id: Ice887a54d029037fa164bb548662dc5b385b3f8d --- radio/aidl/vts/radio_network_test.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/radio/aidl/vts/radio_network_test.cpp b/radio/aidl/vts/radio_network_test.cpp index d95de0d6d3..5cb0158a93 100644 --- a/radio/aidl/vts/radio_network_test.cpp +++ b/radio/aidl/vts/radio_network_test.cpp @@ -237,8 +237,10 @@ TEST_P(RadioNetworkTest, getUsageSetting) { {RadioError::RADIO_NOT_AVAILABLE, RadioError::INVALID_STATE, RadioError::SIM_ABSENT, RadioError::INTERNAL_ERR, RadioError::NONE}); - ASSERT_TRUE(radioRsp_network->usageSetting == UsageSetting::VOICE_CENTRIC || - radioRsp_network->usageSetting == UsageSetting::DATA_CENTRIC); + if (radioRsp_network->rspInfo.error == RadioError::NONE) { + ASSERT_TRUE(radioRsp_network->usageSetting == UsageSetting::VOICE_CENTRIC || + radioRsp_network->usageSetting == UsageSetting::DATA_CENTRIC); + } } void RadioNetworkTest::testSetUsageSetting_InvalidValues(std::vector errors) {