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

Commit a34edd7b authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Add CellIdentity to getBarringInfoResponse am: 8d4a73b1 am: 9164adae 

Change-Id: Ib1b82d7d06d928815ffbc85373a31ff6e00abe52
parents 117c6706 9164adae

current.txt

+1 −1
Original line number Diff line number Diff line
@@ -646,4 +646,4 @@ c9273429fcf98d797d3bb07fdba6f1be95bf960f9255cde169fd1ca4db85f856 android.hardwar 
b0c291c1ee1592b7b12f7bf02bad4cec4bf4f2e41fbd044a9c3885b188114c88 android.hardware.radio@1.5::types

b454df853441c12f6e425e8a60dd29fda20f5e6e39b93d1103e4b37495db38aa android.hardware.radio@1.5::IRadio

fcbb0742a88215ee7a6d7ce0825d253eb2b50391fc6c8c48667f9fd7f6d4549e android.hardware.radio@1.5::IRadioIndication

b9789e8286be3f3390bdef054f38eb7a2052fd9b611613813f5d7e40a465c2c9 android.hardware.radio@1.5::IRadioResponse
 
b809193970a91ca637a4b0184767315601d32e3ef3d5992ffbc7a8d14a14f015 android.hardware.radio@1.5::IRadioResponse

radio/1.5/IRadioResponse.hal

+4 −1
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import @1.0::SendSmsResult; 
import @1.4::IRadioResponse;

import @1.5::BarringInfo;

import @1.5::CardStatus;

import @1.5::CellIdentity;

import @1.5::CellInfo;

import @1.5::PersoSubstate;

import @1.5::RegStateResult;
@@ -191,6 +192,7 @@ interface IRadioResponse extends @1.4::IRadioResponse { 


    /**

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

     * @param cellIdentity CellIdentity for the barring infos.

     * @param barringInfos a vector of barring info for all barring service types

     *

     * Valid errors returned:
@@ -199,7 +201,8 @@ interface IRadioResponse extends @1.4::IRadioResponse { 
     *   RadioError:INTERNAL_ERR

     *   RadioError:MODEM_ERR

     */

    oneway getBarringInfoResponse(RadioResponseInfo info, vec<BarringInfo> barringInfos);

    oneway getBarringInfoResponse(RadioResponseInfo info, CellIdentity cellIdentity,

            vec<BarringInfo> barringInfos);



    /**

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

radio/1.5/vts/functional/radio_hidl_hal_utils_v1_5.h

+1 −0
Original line number Diff line number Diff line
@@ -562,6 +562,7 @@ class RadioResponse_v1_5 : public ::android::hardware::radio::V1_5::IRadioRespon 


    Return<void> getBarringInfoResponse(

            const RadioResponseInfo& info,

            const ::android::hardware::radio::V1_5::CellIdentity& cellIdentity,

            const ::android::hardware::hidl_vec<::android::hardware::radio::V1_5::BarringInfo>&

                    barringInfos);

radio/1.5/vts/functional/radio_response.cpp

+1 −0
Original line number Diff line number Diff line
@@ -977,6 +977,7 @@ Return<void> RadioResponse_v1_5::setIndicationFilterResponse_1_5(const RadioResp 


Return<void> RadioResponse_v1_5::getBarringInfoResponse(

        const RadioResponseInfo& info,

        const ::android::hardware::radio::V1_5::CellIdentity& /*cellIdentity*/,

        const ::android::hardware::hidl_vec<::android::hardware::radio::V1_5::BarringInfo>&

        /*barringInfos*/) {

    rspInfo = info;