Merge "[ANAPIC Review] Remove config 1.3 hal" into sc-dev (f06c7484) · Commits · e / os / android_hardware_interfaces

radio/1.6/vts/functional/radio_hidl_hal_api.cpp

+7 −7

Original line number	Diff line number	Diff line
		@@ -175,7 +175,7 @@ TEST_P(RadioHidlTest_v1_6, getSlicingConfig) {
		EXPECT_EQ(std::cv_status::no_timeout, wait());
		EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_6->rspInfo.type);
		EXPECT_EQ(serial, radioRsp_v1_6->rspInfo.serial);
		if (getRadioHalCapabilities().modemReducedFeatureSet1) {
		if (getRadioHalCapabilities()) {
		ASSERT_TRUE(CheckAnyOfErrors(
		radioRsp_v1_6->rspInfo.error,
		{::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED}));
		@@ -383,7 +383,7 @@ TEST_P(RadioHidlTest_v1_6, setNrDualConnectivityState) {
		EXPECT_EQ(std::cv_status::no_timeout, wait());
		EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_6->rspInfo.type);
		EXPECT_EQ(serial, radioRsp_v1_6->rspInfo.serial);
		if (getRadioHalCapabilities().modemReducedFeatureSet1) {
		if (getRadioHalCapabilities()) {
		ASSERT_TRUE(CheckAnyOfErrors(
		radioRsp_v1_6->rspInfo.error,
		{::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED}));
		@@ -408,7 +408,7 @@ TEST_P(RadioHidlTest_v1_6, isNrDualConnectivityEnabled) {
		EXPECT_EQ(std::cv_status::no_timeout, wait());
		EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_6->rspInfo.type);
		EXPECT_EQ(serial, radioRsp_v1_6->rspInfo.serial);
		if (getRadioHalCapabilities().modemReducedFeatureSet1) {
		if (getRadioHalCapabilities()) {
		ASSERT_TRUE(CheckAnyOfErrors(
		radioRsp_v1_6->rspInfo.error,
		{::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED}));
		@@ -434,7 +434,7 @@ TEST_P(RadioHidlTest_v1_6, setDataThrottling) {
		EXPECT_EQ(std::cv_status::no_timeout, wait());
		EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_6->rspInfo.type);
		EXPECT_EQ(serial, radioRsp_v1_6->rspInfo.serial);
		if (getRadioHalCapabilities().modemReducedFeatureSet1) {
		if (getRadioHalCapabilities()) {
		ASSERT_TRUE(CheckAnyOfErrors(
		radioRsp_v1_6->rspInfo.error,
		{::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED}));
		@@ -454,7 +454,7 @@ TEST_P(RadioHidlTest_v1_6, setDataThrottling) {
		EXPECT_EQ(std::cv_status::no_timeout, wait());
		EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_6->rspInfo.type);
		EXPECT_EQ(serial, radioRsp_v1_6->rspInfo.serial);
		if (getRadioHalCapabilities().modemReducedFeatureSet1) {
		if (getRadioHalCapabilities()) {
		ASSERT_TRUE(CheckAnyOfErrors(
		radioRsp_v1_6->rspInfo.error,
		{::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED}));
		@@ -474,7 +474,7 @@ TEST_P(RadioHidlTest_v1_6, setDataThrottling) {
		EXPECT_EQ(std::cv_status::no_timeout, wait());
		EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_6->rspInfo.type);
		EXPECT_EQ(serial, radioRsp_v1_6->rspInfo.serial);
		if (getRadioHalCapabilities().modemReducedFeatureSet1) {
		if (getRadioHalCapabilities()) {
		ASSERT_TRUE(CheckAnyOfErrors(
		radioRsp_v1_6->rspInfo.error,
		{::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED}));
		@@ -493,7 +493,7 @@ TEST_P(RadioHidlTest_v1_6, setDataThrottling) {
		EXPECT_EQ(std::cv_status::no_timeout, wait());
		EXPECT_EQ(RadioResponseType::SOLICITED, radioRsp_v1_6->rspInfo.type);
		EXPECT_EQ(serial, radioRsp_v1_6->rspInfo.serial);
		if (getRadioHalCapabilities().modemReducedFeatureSet1) {
		if (getRadioHalCapabilities()) {
		ASSERT_TRUE(CheckAnyOfErrors(
		radioRsp_v1_6->rspInfo.error,
		{::android::hardware::radio::V1_6::RadioError::REQUEST_NOT_SUPPORTED}));

radio/1.6/vts/functional/radio_hidl_hal_test.cpp

+4 −6

Original line number	Diff line number	Diff line
		@@ -86,16 +86,14 @@ void RadioHidlTest_v1_6::getDataCallList() {
		* disabled.
		* <p/>
		* Typical usage within VTS:
		* if (getRadioHalCapabilities().modemReducedFeatureSet) return;
		* if (getRadioHalCapabilities()) return;
		*/
		HalDeviceCapabilities RadioHidlTest_v1_6::getRadioHalCapabilities() {
		bool RadioHidlTest_v1_6::getRadioHalCapabilities() {
		sp<::android::hardware::radio::config::V1_3::IRadioConfig> radioConfig_v1_3 =
		::android::hardware::radio::config::V1_3::IRadioConfig::getService();
		if (radioConfig_v1_3.get() == nullptr) {
		// If v1_3 isn't present, the values are initialized to false
		HalDeviceCapabilities radioHalCapabilities;
		memset(&radioHalCapabilities, 0, sizeof(radioHalCapabilities));
		return radioHalCapabilities;
		return false;
		} else {
		// Get radioHalDeviceCapabilities from the radio config
		sp<RadioConfigResponse> radioConfigRsp = new (std::nothrow) RadioConfigResponse(*this);
		@@ -104,6 +102,6 @@ HalDeviceCapabilities RadioHidlTest_v1_6::getRadioHalCapabilities() {

		radioConfig_v1_3->getHalDeviceCapabilities(serial);
		EXPECT_EQ(std::cv_status::no_timeout, wait());
		return radioConfigRsp->halDeviceCapabilities;
		return radioConfigRsp->modemReducedFeatureSet1;
		}
		}

radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h

+1 −3

Original line number	Diff line number	Diff line
		@@ -38,14 +38,12 @@ using namespace ::android::hardware::radio::V1_3;
		using namespace ::android::hardware::radio::V1_2;
		using namespace ::android::hardware::radio::V1_1;
		using namespace ::android::hardware::radio::V1_0;
		using namespace ::android::hardware::radio::config::V1_3;

		using ::android::sp;
		using ::android::hardware::hidl_string;
		using ::android::hardware::hidl_vec;
		using ::android::hardware::Return;
		using ::android::hardware::Void;
		using ::android::hardware::radio::config::V1_3::HalDeviceCapabilities;

		#define MODEM_EMERGENCY_CALL_ESTABLISH_TIME 3
		#define MODEM_EMERGENCY_CALL_DISCONNECT_TIME 3
		@@ -1115,7 +1113,7 @@ class RadioHidlTest_v1_6 : public ::testing::TestWithParam<std::string>,
		public:
		virtual void SetUp() override;

		HalDeviceCapabilities getRadioHalCapabilities();
		bool getRadioHalCapabilities();

		/* radio service handle */
		sp<::android::hardware::radio::V1_6::IRadio> radio_v1_6;

radio/config/1.3/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -13,7 +13,6 @@ hidl_interface {
		name: "android.hardware.radio.config@1.3",
		root: "android.hardware",
		srcs: [
		"types.hal",
		"IRadioConfig.hal",
		"IRadioConfigResponse.hal",
		],

radio/config/1.3/IRadioConfigResponse.hal

+13 −4

Original line number	Diff line number	Diff line
		@@ -18,7 +18,6 @@ package android.hardware.radio.config@1.3;

		import android.hardware.radio@1.6::RadioResponseInfo;
		import @1.2::IRadioConfigResponse;
		import HalDeviceCapabilities;

		/**
		* Interface declaring response functions to solicited radio config requests.
		@@ -26,8 +25,18 @@ import HalDeviceCapabilities;
		interface IRadioConfigResponse extends @1.2::IRadioConfigResponse {
		/**
		* @param info Response info struct containing response type, serial no. and error
		* @param capabilities Capabilities struct containing the capabilities of the
		* device related to the Radio HAL
		* @param modemReducedFeatureSet1 True indicates that the modem does NOT support the following
		* features.
		* - Providing either
		* android.hardware.radio@1.6::LinkCapacityEstimate:secondaryDownlinkCapacityKbps
		* or android.hardware.radio@1.6::LinkCapacityEstimate:secondaryUplinkCapacityKbps
		* when given from
		* android.hardware.radio@1.6::RadioIndication:currentLinkCapacityEstimate
		* - Calling android.hardware.radio@1.6::IRadio.setNrDualConnectivityState
		* or querying android.hardware.radio@1.6::IRadio.isNrDualConnectivityEnabled
		* - Requesting android.hardware.radio@1.6::IRadio.setDataThrottling()
		* - Providing android.hardware.radio@1.6::SlicingConfig through
		* android.hardware.radio@1.6::getSlicingConfig()
		*
		* Valid errors returned:
		* RadioError:NONE
		@@ -35,5 +44,5 @@ interface IRadioConfigResponse extends @1.2::IRadioConfigResponse {
		* RadioError:INTERNAL_ERR
		*/
		oneway getHalDeviceCapabilitiesResponse(RadioResponseInfo info,
		HalDeviceCapabilities capabilities);
		bool modemReducedFeatureSet1);
		};