commit 53b6fae57127daa273d863b331229f15b2dd1a5d
author Xin Li <delphij@google.com> Fri Aug 16 10:15:18 2024 -0700
committer Xin Li <delphij@google.com> Fri Aug 16 10:15:18 2024 -0700
tree a6d9e929bec1ce1b70a61f047daf6d7cce6a1132
parent 9003e94bda3f4d2be6e2fe6df6e3e65ff504ea70
parent 965ff77e74730130aa9ac52877648b3456f09d92

Merge aosp-24Q3-ts-dev

Bug: 358400644
Merged-In: I48189896138da4efacbe1ce8e46f4267e956771f
Change-Id: Ibb687d6d3e2237bc152e41fcac7ded38be3aabbb

radio/aidl/vts/radio_network_test.cpp

diff --git a/radio/aidl/vts/radio_network_test.cpp b/radio/aidl/vts/radio_network_test.cpp
index ec2a29c..914cad0 100644
--- a/radio/aidl/vts/radio_network_test.cpp
+++ b/radio/aidl/vts/radio_network_test.cpp
@@ -2171,6 +2171,14 @@
     // 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}));
 }
 
 /*