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

Commit e92e5a06 authored by Sarah Chin's avatar Sarah Chin Committed by Automerger Merge Worker
Browse files

Merge "Create getSystemSelectionChannel API" am: 4a5f4e5a 

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

Change-Id: Ibd06334e2b478578fe9081fd09065fdf6ea57dbe
parents 935aef6d 4a5f4e5a

radio/1.6/IRadio.hal

+9 −0
Original line number Original line Diff line number Diff line
@@ -349,4 +349,13 @@ interface IRadio extends @1.5::IRadio { 
    oneway setDataThrottling(int32_t serial,

    oneway setDataThrottling(int32_t serial,

            DataThrottlingAction dataThrottlingAction,

            DataThrottlingAction dataThrottlingAction,

            int32_t completionWindowSecs);

            int32_t completionWindowSecs);



    /**

     * Get which bands the modem's background scan is acting on.

     *

     * @param serial Serial number of request.

     *

     * Response callback is IRadioResponse.getSystemSelectionChannelsResponse()

     */

    oneway getSystemSelectionChannels(int32_t serial);

};
 
};

radio/1.6/IRadioResponse.hal

+11 −0
Original line number Original line Diff line number Diff line
@@ -317,4 +317,15 @@ interface IRadioResponse extends @1.5::IRadioResponse { 
     *  RadioError:INVALID_ARGUMENTS

     *  RadioError:INVALID_ARGUMENTS

     */

     */

    oneway setDataThrottlingResponse(RadioResponseInfo info);

    oneway setDataThrottlingResponse(RadioResponseInfo info);



    /**

     * @param info Response info struct containing response type, serial no. and error

     *

     * Valid errors returned:

     *   RadioError:NONE

     *   RadioError:RADIO_NOT_AVAILABLE

     *   RadioError:INTERNAL_ERR

     *   RadioError:INVALID_ARGUMENTS

     */

    oneway getSystemSelectionChannelsResponse(RadioResponseInfo info);

};
 
};

radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -795,6 +795,9 @@ class RadioResponse_v1_6 : public ::android::hardware::radio::V1_6::IRadioRespon 




    Return<void> setDataThrottlingResponse(

    Return<void> setDataThrottlingResponse(

            const ::android::hardware::radio::V1_6::RadioResponseInfo& info);

            const ::android::hardware::radio::V1_6::RadioResponseInfo& info);



    Return<void> getSystemSelectionChannelsResponse(

            const ::android::hardware::radio::V1_6::RadioResponseInfo& info);

};

};





/* Callback class for radio indication */

/* Callback class for radio indication */

radio/1.6/vts/functional/radio_response.cpp

+7 −0
Original line number Original line Diff line number Diff line
@@ -1163,3 +1163,10 @@ Return<void> RadioResponse_v1_6::setDataThrottlingResponse( 
    parent_v1_6.notify(info.serial);

    parent_v1_6.notify(info.serial);

    return Void();

    return Void();

}

}



Return<void> RadioResponse_v1_6::getSystemSelectionChannelsResponse(

        const ::android::hardware::radio::V1_6::RadioResponseInfo& info) {

    rspInfo = info;

    parent_v1_6.notify(info.serial);

    return Void();

}