diff --git a/radio/1.6/IRadio.hal b/radio/1.6/IRadio.hal index 747b2f2ddc..a093dee18a 100644 --- a/radio/1.6/IRadio.hal +++ b/radio/1.6/IRadio.hal @@ -231,9 +231,9 @@ interface IRadio extends @1.5::IRadio { * 3. Disable NR dual connectivity and force secondary cell to be released * {NrDualConnectivityState:DISABLE_IMMEDIATE} - * Response callback is IRadioResponse.enableNRDualConnectivityResponse() + * Response callback is IRadioResponse.setNRDualConnectivityStateResponse() */ - oneway enableNrDualConnectivity(int32_t serial, + oneway setNrDualConnectivityState(int32_t serial, NrDualConnectivityState nrDualConnectivityState); /** diff --git a/radio/1.6/IRadioResponse.hal b/radio/1.6/IRadioResponse.hal index 523185eab0..0379e00329 100644 --- a/radio/1.6/IRadioResponse.hal +++ b/radio/1.6/IRadioResponse.hal @@ -225,7 +225,7 @@ interface IRadioResponse extends @1.5::IRadioResponse { * RadioError:RADIO_NOT_AVAILABLE * RadioError:INTERNAL_ERR */ - oneway enableNrDualConnectivityResponse(RadioResponseInfo info); + oneway setNrDualConnectivityStateResponse(RadioResponseInfo info); /** * @param info Response info struct containing response type, serial no. and error 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 01236c6a4e..6547611b50 100644 --- a/radio/1.6/vts/functional/radio_hidl_hal_api.cpp +++ b/radio/1.6/vts/functional/radio_hidl_hal_api.cpp @@ -260,13 +260,13 @@ TEST_P(RadioHidlTest_v1_6, setRadioPower_1_6_emergencyCall_cancelled) { } /* - * Test IRadio.enableNrDualConnectivity() for the response returned. + * Test IRadio.setNrDualConnectivityState() for the response returned. */ -TEST_P(RadioHidlTest_v1_6, enableNrDualConnectivity) { +TEST_P(RadioHidlTest_v1_6, setNrDualConnectivityState) { serial = GetRandomSerialNumber(); Return res = - radio_v1_6->enableNrDualConnectivity(serial, NrDualConnectivityState::DISABLE); + radio_v1_6->setNrDualConnectivityState(serial, NrDualConnectivityState::DISABLE); ASSERT_OK(res); EXPECT_EQ(std::cv_status::no_timeout, wait()); diff --git a/radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h b/radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h index f061c6027a..989ba6db96 100644 --- a/radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h +++ b/radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h @@ -773,7 +773,7 @@ class RadioResponse_v1_6 : public ::android::hardware::radio::V1_6::IRadioRespon const ::android::hardware::radio::V1_6::RadioResponseInfo& info, const SendSmsResult& sms); - Return enableNrDualConnectivityResponse( + Return setNrDualConnectivityStateResponse( const ::android::hardware::radio::V1_6::RadioResponseInfo& info); Return isNrDualConnectivityEnabledResponse( const ::android::hardware::radio::V1_6::RadioResponseInfo& info, bool isEnabled); diff --git a/radio/1.6/vts/functional/radio_response.cpp b/radio/1.6/vts/functional/radio_response.cpp index dc4f57db3d..18cda6aae4 100644 --- a/radio/1.6/vts/functional/radio_response.cpp +++ b/radio/1.6/vts/functional/radio_response.cpp @@ -1055,7 +1055,7 @@ Return RadioResponse_v1_6::setupDataCallResponse_1_6( parent_v1_6.notify(info.serial); return Void(); } -Return RadioResponse_v1_6::enableNrDualConnectivityResponse( +Return RadioResponse_v1_6::setNrDualConnectivityStateResponse( const ::android::hardware::radio::V1_6::RadioResponseInfo& info) { rspInfo = info; parent_v1_6.notify(info.serial);