Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "ALLOW REQUEST_NOT_SUPPORTED for nr dual connectivity config"

Browse Source
This commit is contained in:
Sooraj Sasindran
2021-03-15 04:38:24 +00:00
committed by Gerrit Code Review
parent 03fb28b9fc 4b272a5b68
commit 5cfbacbb7c
3 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
radio/1.6/IRadioResponse.hal
View File

@@ -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);

18
radio/1.6/vts/functional/radio_hidl_hal_api.cpp
View File

@@ -369,10 +369,17 @@ 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}));
}
} }
/* /*
@@ -387,10 +394,17 @@ 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}));
}
} }
/* /*

3
radio/config/1.3/types.hal
View File

@@ -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;