Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 514435af authored by Sooraj Sasindran's avatar Sooraj Sasindran Committed by Android (Google) Code Review
Browse files

Merge "Rename enableNrDualConnectivity"

parents 67f6c1b7 56d4de8e

radio/1.6/IRadio.hal

+2 −2
Original line number Diff line number Diff line
@@ -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);



    /**

radio/1.6/IRadioResponse.hal

+1 −1
Original line number Diff line number Diff line
@@ -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

radio/1.6/vts/functional/radio_hidl_hal_api.cpp

+3 −3
Original line number Diff line number Diff line
@@ -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());

radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

radio/1.6/vts/functional/radio_response.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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);