Snap for 11840485 from fdaed0bf20231213cd5afbb3bdc733a87720ba5c to 24Q3-release (7626214c) · Commits · e / os / android_hardware_interfaces

audio/aidl/default/Stream.cpp

+10 −6

Original line number	Diff line number	Diff line
		@@ -183,17 +183,19 @@ StreamInWorkerLogic::Status StreamInWorkerLogic::cycle() {
		switch (command.getTag()) {
		case Tag::halReservedExit: {
		const int32_t cookie = command.get<Tag::halReservedExit>();
		StreamInWorkerLogic::Status status = Status::CONTINUE;
		if (cookie == (mContext->getInternalCommandCookie() ^ getTid())) {
		mDriver->shutdown();
		setClosed();
		status = Status::EXIT;
		} else {
		LOG(WARNING) << __func__ << ": EXIT command has a bad cookie: " << cookie;
		}
		if (cookie != 0) { // This is an internal command, no need to reply.
		return Status::EXIT;
		} else {
		break;
		return status;
		}
		// `cookie == 0` can only occur in the context of a VTS test, need to reply.
		break;
		}
		case Tag::getStatus:
		populateReply(&reply, mIsConnected);
		@@ -411,17 +413,19 @@ StreamOutWorkerLogic::Status StreamOutWorkerLogic::cycle() {
		switch (command.getTag()) {
		case Tag::halReservedExit: {
		const int32_t cookie = command.get<Tag::halReservedExit>();
		StreamOutWorkerLogic::Status status = Status::CONTINUE;
		if (cookie == (mContext->getInternalCommandCookie() ^ getTid())) {
		mDriver->shutdown();
		setClosed();
		status = Status::EXIT;
		} else {
		LOG(WARNING) << __func__ << ": EXIT command has a bad cookie: " << cookie;
		}
		if (cookie != 0) { // This is an internal command, no need to reply.
		return Status::EXIT;
		} else {
		break;
		return status;
		}
		// `cookie == 0` can only occur in the context of a VTS test, need to reply.
		break;
		}
		case Tag::getStatus:
		populateReply(&reply, mIsConnected);

radio/aidl/android/hardware/radio/network/IRadioNetworkResponse.aidl

+8 −0

Original line number	Diff line number	Diff line
		@@ -747,6 +747,7 @@ oneway interface IRadioNetworkResponse {

		/**
		* Response of isCellularIdentifierTransparencyEnabled.
		* This is an optional API.
		*
		* @param info Response info struct containing response type, serial no. and error.
		* @param isEnabled Indicates whether cellular identifier transparency is enabled or not.
		@@ -757,12 +758,14 @@ oneway interface IRadioNetworkResponse {
		* RadioError:NONE
		* RadioError:RADIO_NOT_AVAILABLE
		* RadioError:INTERNAL_ERR
		* RadioError:REQUEST_NOT_SUPPORTED
		*/
		void isCellularIdentifierTransparencyEnabledResponse(
		in RadioResponseInfo info, boolean isEnabled);

		/**
		* Response of setCellularIdentifierTransparencyEnabled.
		* This is an optional API.
		*
		* @param info Response info struct containing response type, serial no. and error.
		*
		@@ -773,11 +776,13 @@ oneway interface IRadioNetworkResponse {
		* RadioError:RADIO_NOT_AVAILABLE
		* RadioError:INTERNAL_ERR
		* RadioError:INVALID_STATE
		* RadioError:REQUEST_NOT_SUPPORTED
		*/
		void setCellularIdentifierTransparencyEnabledResponse(in RadioResponseInfo info);

		/**
		* Response of setSecurityAlgorithmsUpdatedEnabled.
		* This is an optional API.
		*
		* @param info Response info struct containing response type, serial no. and error.
		*
		@@ -788,11 +793,13 @@ oneway interface IRadioNetworkResponse {
		* RadioError:RADIO_NOT_AVAILABLE
		* RadioError:INTERNAL_ERR
		* RadioError:INVALID_STATE
		* RadioError:REQUEST_NOT_SUPPORTED
		*/
		void setSecurityAlgorithmsUpdatedEnabledResponse(in RadioResponseInfo info);

		/**
		* Response of isSecurityAlgorithmsUpdatedEnabled.
		* This is an optional API.
		*
		* @param info Response info struct containing response type, serial no. and error.
		* @param isEnabled Indicates whether cellular ciphering transparency is enabled or not.
		@@ -803,6 +810,7 @@ oneway interface IRadioNetworkResponse {
		* RadioError:NONE
		* RadioError:RADIO_NOT_AVAILABLE
		* RadioError:INTERNAL_ERR
		* RadioError:REQUEST_NOT_SUPPORTED
		*/
		void isSecurityAlgorithmsUpdatedEnabledResponse(
		in RadioResponseInfo info, in boolean isEnabled);

radio/aidl/vts/radio_network_test.cpp

+18 −18

Original line number	Diff line number	Diff line
		@@ -2459,9 +2459,9 @@ TEST_P(RadioNetworkTest, isCellularIdentifierTransparencyEnabled) {
		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::RADIO_NOT_AVAILABLE, RadioError::MODEM_ERR}));
		ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error,
		{RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE,
		RadioError::MODEM_ERR, RadioError::REQUEST_NOT_SUPPORTED}));
		}

		TEST_P(RadioNetworkTest, setCellularIdentifierTransparencyEnabled) {
		@@ -2490,9 +2490,9 @@ TEST_P(RadioNetworkTest, setCellularIdentifierTransparencyEnabled) {
		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::RADIO_NOT_AVAILABLE, RadioError::MODEM_ERR}));
		ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error,
		{RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE,
		RadioError::MODEM_ERR, RadioError::REQUEST_NOT_SUPPORTED}));

		// Assert the value has changed
		serial = GetRandomSerialNumber();
		@@ -2502,9 +2502,9 @@ TEST_P(RadioNetworkTest, setCellularIdentifierTransparencyEnabled) {
		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::RADIO_NOT_AVAILABLE, RadioError::MODEM_ERR}));
		ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error,
		{RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE,
		RadioError::MODEM_ERR, RadioError::REQUEST_NOT_SUPPORTED}));
		EXPECT_EQ(valueToSet, radioRsp_network->isCellularIdentifierTransparencyEnabled);

		// Reset original state
		@@ -2543,9 +2543,9 @@ TEST_P(RadioNetworkTest, setSecurityAlgorithmsUpdatedEnabled) {
		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::RADIO_NOT_AVAILABLE, RadioError::MODEM_ERR}));
		ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error,
		{RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE,
		RadioError::MODEM_ERR, RadioError::REQUEST_NOT_SUPPORTED}));

		// Assert the value has changed
		serial = GetRandomSerialNumber();
		@@ -2555,9 +2555,9 @@ TEST_P(RadioNetworkTest, setSecurityAlgorithmsUpdatedEnabled) {
		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::RADIO_NOT_AVAILABLE, RadioError::MODEM_ERR}));
		ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error,
		{RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE,
		RadioError::MODEM_ERR, RadioError::REQUEST_NOT_SUPPORTED}));
		EXPECT_EQ(valueToSet, radioRsp_network->isSecurityAlgorithmsUpdatedEnabled);

		// Reset original state
		@@ -2589,7 +2589,7 @@ TEST_P(RadioNetworkTest, isSecurityAlgorithmsUpdatedEnabled) {
		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::RADIO_NOT_AVAILABLE, RadioError::MODEM_ERR}));
		ASSERT_TRUE(CheckAnyOfErrors(radioRsp_network->rspInfo.error,
		{RadioError::NONE, RadioError::RADIO_NOT_AVAILABLE,
		RadioError::MODEM_ERR, RadioError::REQUEST_NOT_SUPPORTED}));
		}

tv/tuner/aidl/vts/functional/VtsHalTvTunerTargetTest.h

+1 −5

Original line number	Diff line number	Diff line
		@@ -31,11 +31,7 @@ namespace {

		bool initConfiguration() {
		std::array<char, PROPERTY_VALUE_MAX> variant;
		auto res = property_get("ro.vendor.vts_tuner_configuration_variant", variant.data(), "");
		if (res <= 0) {
		ALOGE("[vts] failed to read system property ro.vendor.vts_tuner_configuration_variant");
		return false;
		}
		property_get("ro.vendor.vts_tuner_configuration_variant", variant.data(), "");
		string configFilePath = "/vendor/etc/tuner_vts_config_aidl_V1";
		if (variant.size() != 0) {
		configFilePath = configFilePath + "." + variant.data();