Merge "ALLOW REQUEST_NOT_SUPPORTED for nr dual connectivity config" (5cfbacbb) · Commits · e / os / android_hardware_interfaces

radio/1.6/IRadioResponse.hal

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -230,6 +230,7 @@ interface IRadioResponse extends @1.5::IRadioResponse {
	* RadioError:NONE		* RadioError:NONE
	* RadioError:RADIO_NOT_AVAILABLE		* RadioError:RADIO_NOT_AVAILABLE
	* RadioError:INTERNAL_ERR		* RadioError:INTERNAL_ERR
			* RadioError:REQUEST_NOT_SUPPORTED
	*/		*/
	oneway setNrDualConnectivityStateResponse(RadioResponseInfo info);		oneway setNrDualConnectivityStateResponse(RadioResponseInfo info);

	@@ -242,6 +243,7 @@ interface IRadioResponse extends @1.5::IRadioResponse {
	* RadioError:NONE		* RadioError:NONE
	* RadioError:RADIO_NOT_AVAILABLE		* RadioError:RADIO_NOT_AVAILABLE
	* RadioError:INTERNAL_ERR		* RadioError:INTERNAL_ERR
			* RadioError:REQUEST_NOT_SUPPORTED
	*/		*/
	oneway isNrDualConnectivityEnabledResponse(RadioResponseInfo info, bool isEnabled);		oneway isNrDualConnectivityEnabledResponse(RadioResponseInfo info, bool isEnabled);

radio/1.6/vts/functional/radio_hidl_hal_api.cpp

+16 −2

Original line number	Original line	Diff line number	Diff line
	@@ -369,11 +369,18 @@ TEST_P(RadioHidlTest_v1_6, setNrDualConnectivityState) {
	EXPECT_EQ(std::cv_status::no_timeout, wait());		EXPECT_EQ(std::cv_status::no_timeout, wait());
	EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_6->rspInfo.type);		EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_6->rspInfo.type);
	EXPECT_EQ(serial, radioRsp_v1_6->rspInfo.serial);		EXPECT_EQ(serial, radioRsp_v1_6->rspInfo.serial);
	ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_6->rspInfo.error,		if (getRadioHalCapabilities().modemReducedFeatureSet1) {
			ASSERT_TRUE(CheckAnyOfErrors(
			radioRsp_v1_6->rspInfo.error,
			{::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED}));
			} else {
			ASSERT_TRUE(
			CheckAnyOfErrors(radioRsp_v1_6->rspInfo.error,
	{::android::hardware::radio::V1_6::RadioError::RADIO_NOT_AVAILABLE,		{::android::hardware::radio::V1_6::RadioError::RADIO_NOT_AVAILABLE,
	::android::hardware::radio::V1_6::RadioError::INTERNAL_ERR,		::android::hardware::radio::V1_6::RadioError::INTERNAL_ERR,
	::android::hardware::radio::V1_6::RadioError::NONE}));		::android::hardware::radio::V1_6::RadioError::NONE}));
	}		}
			}

	/*		/*
	* Test IRadio.isNrDualConnectivityEnabled() for the response returned.		* Test IRadio.isNrDualConnectivityEnabled() for the response returned.
	@@ -387,11 +394,18 @@ TEST_P(RadioHidlTest_v1_6, isNrDualConnectivityEnabled) {
	EXPECT_EQ(std::cv_status::no_timeout, wait());		EXPECT_EQ(std::cv_status::no_timeout, wait());
	EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_6->rspInfo.type);		EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_6->rspInfo.type);
	EXPECT_EQ(serial, radioRsp_v1_6->rspInfo.serial);		EXPECT_EQ(serial, radioRsp_v1_6->rspInfo.serial);
	ASSERT_TRUE(CheckAnyOfErrors(radioRsp_v1_6->rspInfo.error,		if (getRadioHalCapabilities().modemReducedFeatureSet1) {
			ASSERT_TRUE(CheckAnyOfErrors(
			radioRsp_v1_6->rspInfo.error,
			{::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED}));
			} else {
			ASSERT_TRUE(
			CheckAnyOfErrors(radioRsp_v1_6->rspInfo.error,
	{::android::hardware::radio::V1_6::RadioError::RADIO_NOT_AVAILABLE,		{::android::hardware::radio::V1_6::RadioError::RADIO_NOT_AVAILABLE,
	::android::hardware::radio::V1_6::RadioError::INTERNAL_ERR,		::android::hardware::radio::V1_6::RadioError::INTERNAL_ERR,
	::android::hardware::radio::V1_6::RadioError::NONE}));		::android::hardware::radio::V1_6::RadioError::NONE}));
	}		}
			}

	/*		/*
	* Test IRadio.setDataThrottling() for the response returned.		* Test IRadio.setDataThrottling() for the response returned.

radio/config/1.3/types.hal

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -28,6 +28,9 @@ struct HalDeviceCapabilities {
	* or android.hardware.radio@1.6::LinkCapacityEstimate:secondaryUplinkCapacityKbps		* or android.hardware.radio@1.6::LinkCapacityEstimate:secondaryUplinkCapacityKbps
	* when given from android.hardware.radio@1.6::RadioIndication:currentLinkCapacityEstimate		* when given from android.hardware.radio@1.6::RadioIndication:currentLinkCapacityEstimate
	* </li>		* </li>
			* <li> calling android.hardware.radio@1.6::IRadio.setNrDualConnectivityState
			* or querying android.hardware.radio@1.6::IRadio.isNrDualConnectivityEnabled
			* </li>
	* </ul>		* </ul>
	*/		*/
	bool modemReducedFeatureSet1;		bool modemReducedFeatureSet1;