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

Commit 7afe2319 authored by Rambo Wang's avatar Rambo Wang Committed by Android (Google) Code Review
Browse files

Merge "Add CellIdentity to getBarringInfoResponse"

parents 0367b062 6894f89f

current.txt

+1 −1
Original line number Diff line number Diff line
@@ -685,7 +685,7 @@ def77c7db95d374f11a111bfc4ed60f92451303642a43276c4e291988fcee625 android.hardwar 
e1d34b83188a8ef3c507ec53c0ebcf714863c746da7f4a05460453f7c4c09389 android.hardware.radio@1.5::types

8062d0a1a03594dd8b448adcf6f08856b5720f7e33f9b785a21d3ef74a4f211d android.hardware.radio@1.5::IRadio

e96ae1c3a9c0689002ec2318e9c587f4f607c16a75a3cd38788b77eb91072021 android.hardware.radio@1.5::IRadioIndication

7f2439b48bda2961c6d629d0415eee66d519142cf9537f05e9d285153c70ca85 android.hardware.radio@1.5::IRadioResponse

c8a8e4c3998ebdf1c71ece2d3ecb033ae17798830bed4b30a53e5991aa219e3a android.hardware.radio@1.5::IRadioResponse

dcc8872337f0135e81970e1d8d5fd7139160dc80e9be76f0ae05290fa7e472b8 android.hardware.radio.config@1.3::types

a2977755bc5f1ef47f04b7f2400632efda6218e1515dba847da487145cfabc4f android.hardware.radio.config@1.3::IRadioConfig

742360c775313438b0f82256eac62fb5bbc76a6ae6f388573f3aa142fb2c1eea android.hardware.radio.config@1.3::IRadioConfigIndication

radio/1.5/IRadioResponse.hal

+4 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import @1.0::RadioResponseInfo; 
import @1.0::SendSmsResult;

import @1.4::IRadioResponse;

import @1.5::BarringInfo;

import @1.5::CellIdentity;

import @1.5::CellInfo;

import @1.5::PersoSubstate;

import @1.5::RegStateResult;
@@ -165,6 +166,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:
@@ -173,7 +175,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
@@ -556,6 +556,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
@@ -963,6 +963,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;