Merge "Fix test of triggerEmergencyNetworkScan" into main (194b5fc9) · Commits · e / os / android_hardware_interfaces

radio/aidl/vts/radio_network_test.cpp

+25 −0

Original line number	Diff line number	Diff line
		@@ -2195,6 +2195,18 @@ TEST_P(RadioNetworkTest, triggerEmergencyNetworkScan) {

		serial = GetRandomSerialNumber();

		radio_network->setEmergencyMode(serial, EmergencyMode::EMERGENCY_WWAN);
		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, RadioError::INVALID_ARGUMENTS}));

		serial = GetRandomSerialNumber();

		EmergencyNetworkScanTrigger scanRequest;
		scanRequest.accessNetwork = {AccessNetwork::EUTRAN};
		scanRequest.scanType = EmergencyScanType::NO_PREFERENCE;
		@@ -2208,6 +2220,19 @@ TEST_P(RadioNetworkTest, triggerEmergencyNetworkScan) {
		radioRsp_network->rspInfo.error,
		{RadioError::NONE, RadioError::REQUEST_NOT_SUPPORTED, RadioError::RADIO_NOT_AVAILABLE,
		RadioError::MODEM_ERR, RadioError::INVALID_ARGUMENTS}));

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

		/*