From e5f54157a4ccc1b78c041055fea5b8d005ffd29b Mon Sep 17 00:00:00 2001 From: Mengjie Xie Date: Thu, 11 Jul 2024 10:25:07 +0800 Subject: [PATCH] Case finished without waiting for hal result In VTS case RadioNeteworkTest#setEmergencyMode, Case finishes without waiting for the result of exitEmergencyMode. When the response is back, destroyed mutex will be used, It will lead case end abnormally. So, waiting for the response of exitEmergencyMode is necessary. Bug: 352533464 Test: run VTS case RadioNetworkTest#setEmergencyMode (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:80f66789017ed8c3b3b9d038f67446f58d80ea60) Merged-In: I52c527195b71e112275d74c80d0f9c91e42b3041 Change-Id: I52c527195b71e112275d74c80d0f9c91e42b3041 --- radio/aidl/vts/radio_network_test.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/radio/aidl/vts/radio_network_test.cpp b/radio/aidl/vts/radio_network_test.cpp index ec2a29c677..914cad0cd2 100644 --- a/radio/aidl/vts/radio_network_test.cpp +++ b/radio/aidl/vts/radio_network_test.cpp @@ -2171,6 +2171,14 @@ TEST_P(RadioNetworkTest, setEmergencyMode) { // exit emergency mode for other tests serial = GetRandomSerialNumber(); radio_network->exitEmergencyMode(serial); + + EXPECT_EQ(std::cv_status::no_timeout, wait()); + EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_network->rspInfo.type); + EXPECT_EQ(serial, radioRsp_network->rspInfo.serial); + + ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error, + {RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED, + RadioError::RADIO_NOT_AVAILABLE, RadioError::MODEM_ERR})); } /*