From 4b272a5b68eeff82b6f45629d851568346a4bb22 Mon Sep 17 00:00:00 2001 From: Sooraj Sasindran Date: Thu, 11 Mar 2021 16:50:00 -0800 Subject: [PATCH] ALLOW REQUEST_NOT_SUPPORTED for nr dual connectivity config ALLOW REQUEST_NOT_SUPPORTED for nr dual connectivity configuration and query Bug: 181648176 Test: build Change-Id: Iaa64b018a07367ea9d68783ecec1ea1a616ad6b4 --- radio/1.6/IRadioResponse.hal | 2 ++ .../1.6/vts/functional/radio_hidl_hal_api.cpp | 18 ++++++++++++++++-- radio/config/1.3/types.hal | 3 +++ 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/radio/1.6/IRadioResponse.hal b/radio/1.6/IRadioResponse.hal index 56ce809dfe..d65c6d0fe4 100644 --- a/radio/1.6/IRadioResponse.hal +++ b/radio/1.6/IRadioResponse.hal @@ -230,6 +230,7 @@ interface IRadioResponse extends @1.5::IRadioResponse { * RadioError:NONE * RadioError:RADIO_NOT_AVAILABLE * RadioError:INTERNAL_ERR + * RadioError:REQUEST_NOT_SUPPORTED */ oneway setNrDualConnectivityStateResponse(RadioResponseInfo info); @@ -242,6 +243,7 @@ interface IRadioResponse extends @1.5::IRadioResponse { * RadioError:NONE * RadioError:RADIO_NOT_AVAILABLE * RadioError:INTERNAL_ERR + * RadioError:REQUEST_NOT_SUPPORTED */ oneway isNrDualConnectivityEnabledResponse(RadioResponseInfo info, bool isEnabled); diff --git a/radio/1.6/vts/functional/radio_hidl_hal_api.cpp b/radio/1.6/vts/functional/radio_hidl_hal_api.cpp index e82c01a049..91d98cbce1 100644 --- a/radio/1.6/vts/functional/radio_hidl_hal_api.cpp +++ b/radio/1.6/vts/functional/radio_hidl_hal_api.cpp @@ -369,10 +369,17 @@ 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); - 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::INTERNAL_ERR, ::android::hardware::radio::V1_6::RadioError::NONE})); + } } /* @@ -387,10 +394,17 @@ 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); - 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::INTERNAL_ERR, ::android::hardware::radio::V1_6::RadioError::NONE})); + } } /* diff --git a/radio/config/1.3/types.hal b/radio/config/1.3/types.hal index 8915970d67..117abf3211 100644 --- a/radio/config/1.3/types.hal +++ b/radio/config/1.3/types.hal @@ -28,6 +28,9 @@ struct HalDeviceCapabilities { * 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 + *
    • * */ bool modemReducedFeatureSet1;