Merge "setCellularIdentifierTransparencyEnabled: skip on errors" into main (8dd21e5d) · Commits · e / os / android_hardware_interfaces

radio/aidl/vts/radio_network_test.cpp

+18 −18

Original line number	Diff line number	Diff line
		@@ -2552,8 +2552,8 @@ TEST_P(RadioNetworkTest, setCellularIdentifierTransparencyEnabled) {
		ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error,
		{RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE,
		RadioError::MODEM_ERR, RadioError::REQUEST_NOT_SUPPORTED}));
		if (radioRsp_network->rspInfo.error != RadioError::NONE) return;

		if (radioRsp_network->rspInfo.error == RadioError::NONE) {
		// Assert the value has changed
		serial = GetRandomSerialNumber();
		ndk::ScopedAStatus res = radio_network->isCellularIdentifierTransparencyEnabled(serial);
		@@ -2565,16 +2565,16 @@ TEST_P(RadioNetworkTest, setCellularIdentifierTransparencyEnabled) {
		ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error,
		{RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE,
		RadioError::MODEM_ERR, RadioError::REQUEST_NOT_SUPPORTED}));
		if (radioRsp_network->rspInfo.error == RadioError::NONE) {
		EXPECT_EQ(valueToSet, radioRsp_network->isCellularIdentifierTransparencyEnabled);
		}

		// Reset original state
		radio_network->setCellularIdentifierTransparencyEnabled(serial,
		originalTransparencySetting);
		radio_network->setCellularIdentifierTransparencyEnabled(serial, originalTransparencySetting);
		EXPECT_EQ(std::cv_status::no_timeout, wait());
		EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_network->rspInfo.type);
		EXPECT_EQ(serial, radioRsp_network->rspInfo.serial);
		}
		}

		/*
		* Test IRadioNetwork.setSecurityAlgorithmsUpdatedEnabled for the response returned.