Merge aosp-24Q3-ts-dev

Bug: 358400644
Merged-In: I48189896138da4efacbe1ce8e46f4267e956771f
Change-Id: Ibb687d6d3e2237bc152e41fcac7ded38be3aabbb
This commit is contained in:
Xin Li
2024-08-16 10:15:18 -07:00

View File

@@ -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}));
}
/*