tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "ALLOW REQUEST_NOT_SUPPORTED for nr dual connectivity config" am: 5cfbacbb7c

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1629124

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idb10c8fe67d7cfe75585989b5360c7361dccfae2
This commit is contained in:
Sooraj Sasindran 2021-03-15 05:22:33 +00:00 committed by Automerger Merge Worker
commit af7f0f7678
3 changed files with 21 additions and 2 deletions
Show stats 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: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);

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(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}));
}
}
/*

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

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