Rename enableNrDualConnectivity am: e9525fdd5f am: 62b012621e

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

Change-Id: I0bac9b52d7c26e2debf4ceb0698f5bbe8c612d02
This commit is contained in:
Sooraj Sasindran
2020-11-12 22:46:04 +00:00
committed by Automerger Merge Worker
5 changed files with 8 additions and 8 deletions

View File

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

View File

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

View File

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

View File

@@ -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<void> enableNrDualConnectivityResponse(
Return<void> setNrDualConnectivityStateResponse(
const ::android::hardware::radio::V1_6::RadioResponseInfo& info);
Return<void> isNrDualConnectivityEnabledResponse(
const ::android::hardware::radio::V1_6::RadioResponseInfo& info, bool isEnabled);

View File

@@ -1055,7 +1055,7 @@ Return<void> RadioResponse_v1_6::setupDataCallResponse_1_6(
parent_v1_6.notify(info.serial);
return Void();
}
Return<void> RadioResponse_v1_6::enableNrDualConnectivityResponse(
Return<void> RadioResponse_v1_6::setNrDualConnectivityStateResponse(
const ::android::hardware::radio::V1_6::RadioResponseInfo& info) {
rspInfo = info;
parent_v1_6.notify(info.serial);