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

Commit 3ab5bb0c authored by SongFerng Wang's avatar SongFerng Wang Committed by Automerger Merge Worker
Browse files

Merge "Rename AllowedNetworkType to AllowedNetworkTypes" am: d24ac0c0 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I282df1185f592ca2a5338af5ba5c2662c3a3a842
parents 877bdc21 d24ac0c0

radio/1.6/IRadio.hal

+9 −10
Original line number Diff line number Diff line
@@ -347,8 +347,9 @@ interface IRadio extends @1.5::IRadio { 
    /**

     * Requests to set the network type for searching and registering.

     *

     * Instruct the radio to *only* accept the types of network provided. This

     * is stronger than setPreferredNetworkType which is a suggestion.

     * Instruct the radio to *only* accept the types of network provided.

     * setPreferredNetworkType, setPreferredNetworkTypesBitmap will not be called anymore

     * except for IRadio v1.5 or older devices.

     *

     * In case of an emergency call, the modem is authorized to bypass this

     * restriction.
@@ -356,24 +357,22 @@ interface IRadio extends @1.5::IRadio { 
     * @param serial Serial number of request.

     * @param networkTypeBitmap a 32-bit bearer bitmap of RadioAccessFamily

     *

     * Response callback is IRadioResponse.setNetworkTypeBitmapResponse()

     * Response callback is IRadioResponse.setAllowedNetworkTypesBitmapResponse()

     */

    oneway setAllowedNetworkTypeBitmap(

    oneway setAllowedNetworkTypesBitmap(

            uint32_t serial, bitfield<RadioAccessFamily> networkTypeBitmap);



    /**

     * Requests bitmap representing the currently allowed network types.

     *

     * Requests the bitmap set by the corresponding method

     * setAllowedNetworkTypeBitmap, which sets a strict set of RATs for the

     * radio to use. Differs from getPreferredNetworkType and getPreferredNetworkTypeBitmap

     * in that those request *preferences*.

     * getPreferredNetworkType, getPreferredNetworkTypesBitmap will not be called anymore

     * except for IRadio v1.5 or older devices.

     *

     * @param serial Serial number of request.

     *

     * Response callback is IRadioResponse.getNetworkTypeBitmapResponse()

     * Response callback is IRadioResponse.getAllowedNetworkTypesBitmapResponse()

     */

    oneway getAllowedNetworkTypeBitmap(uint32_t serial);

    oneway getAllowedNetworkTypesBitmap(uint32_t serial);



    /**

     * Control data throttling at modem.

radio/1.6/IRadioResponse.hal

+6 −4
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ interface IRadioResponse extends @1.5::IRadioResponse { 
    oneway cancelHandoverResponse(RadioResponseInfo info);



    /**

     * Callback of IRadio.setAllowedNetworkTypeBitmap(int, bitfield<RadioAccessFamily>)

     * Callback of IRadio.setAllowedNetworkTypesBitmap(int, bitfield<RadioAccessFamily>)

     *

     * Valid errors returned:

     *   RadioError:NONE
@@ -311,10 +311,12 @@ interface IRadioResponse extends @1.5::IRadioResponse { 
     *   RadioError:REQUEST_NOT_SUPPORTED

     *   RadioError:NO_RESOURCES

     */

    oneway setAllowedNetworkTypeBitmapResponse(RadioResponseInfo info);

    oneway setAllowedNetworkTypesBitmapResponse(RadioResponseInfo info);



    /**

     * Callback of IRadio.getAllowedNetworkTypeBitmap(int, bitfield<RadioAccessFamily>)

     * Callback of IRadio.getAllowedNetworkTypesBitmap(int, bitfield<RadioAccessFamily>)

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

     * @param networkTypeBitmap a 32-bit bitmap of RadioAccessFamily.

     *

     * Valid errors returned:

     *   RadioError:NONE
@@ -327,7 +329,7 @@ interface IRadioResponse extends @1.5::IRadioResponse { 
     *   RadioError:REQUEST_NOT_SUPPORTED

     *   RadioError:NO_RESOURCES

     */

    oneway getAllowedNetworkTypeBitmapResponse(

    oneway getAllowedNetworkTypesBitmapResponse(

            RadioResponseInfo info, bitfield<RadioAccessFamily> networkTypeBitmap);



    /**

radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h

+2 −2
Original line number Diff line number Diff line
@@ -792,10 +792,10 @@ class RadioResponse_v1_6 : public ::android::hardware::radio::V1_6::IRadioRespon 
    Return<void> cancelHandoverResponse(

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



    Return<void> setAllowedNetworkTypeBitmapResponse(

    Return<void> setAllowedNetworkTypesBitmapResponse(

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



    Return<void> getAllowedNetworkTypeBitmapResponse(

    Return<void> getAllowedNetworkTypesBitmapResponse(

            const ::android::hardware::radio::V1_6::RadioResponseInfo& info,

            const ::android::hardware::hidl_bitfield<

                    ::android::hardware::radio::V1_4::RadioAccessFamily>

radio/1.6/vts/functional/radio_response.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1155,14 +1155,14 @@ Return<void> RadioResponse_v1_6::cancelHandoverResponse( 
    return Void();

}



Return<void> RadioResponse_v1_6::setAllowedNetworkTypeBitmapResponse(

Return<void> RadioResponse_v1_6::setAllowedNetworkTypesBitmapResponse(

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

    rspInfo = info;

    parent_v1_6.notify(info.serial);

    return Void();

}



Return<void> RadioResponse_v1_6::getAllowedNetworkTypeBitmapResponse(

Return<void> RadioResponse_v1_6::getAllowedNetworkTypesBitmapResponse(

        const ::android::hardware::radio::V1_6::RadioResponseInfo& /*info*/,

        const ::android::hardware::hidl_bitfield<

                ::android::hardware::radio::V1_4::RadioAccessFamily>