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

Commit c3325707 authored by Sarah Chin's avatar Sarah Chin Committed by Gerrit Code Review
Browse files

Merge "Allow getSystemSelectionChannels to return specifiers"

parents 721de0e8 e52a3943

radio/1.6/IRadio.hal

+1 −1
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ interface IRadio extends @1.5::IRadio { 
     * cell information isn't known then the appropriate unknown value will be returned.

     * This does not cause or change the rate of unsolicited cellInfoList().

     *

     * This is identitcal to getCellInfoList in V1.0, but it requests updated version of CellInfo.

     * This is identical to getCellInfoList in V1.0, but it requests updated version of CellInfo.

     *

     * @param serial Serial number of request.

     *

radio/1.6/IRadioResponse.hal

+4 −1
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package android.hardware.radio@1.6; 
import @1.0::SendSmsResult;

import @1.4::RadioAccessFamily;

import @1.5::IRadioResponse;

import @1.5::RadioAccessSpecifier;

import @1.6::Call;

import @1.6::CellInfo;

import @1.6::RegStateResult;
@@ -341,6 +342,7 @@ interface IRadioResponse extends @1.5::IRadioResponse { 


    /**

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

     * @param specifiers List of RadioAccessSpecifiers that are scanned.

     *

     * Valid errors returned:

     *   RadioError:NONE
@@ -348,7 +350,8 @@ interface IRadioResponse extends @1.5::IRadioResponse { 
     *   RadioError:INTERNAL_ERR

     *   RadioError:INVALID_ARGUMENTS

     */

    oneway getSystemSelectionChannelsResponse(RadioResponseInfo info);

    oneway getSystemSelectionChannelsResponse(

            RadioResponseInfo info, vec<RadioAccessSpecifier> specifiers);



    /**

     * This is identical to getCellInfoListResponse_1_5 but uses an updated version of CellInfo.

radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h

+2 −1
Original line number Diff line number Diff line
@@ -804,7 +804,8 @@ class RadioResponse_v1_6 : public ::android::hardware::radio::V1_6::IRadioRespon 
            const ::android::hardware::radio::V1_6::RadioResponseInfo& info);



    Return<void> getSystemSelectionChannelsResponse(

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

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

            const hidl_vec<::android::hardware::radio::V1_5::RadioAccessSpecifier>& specifier);



    Return<void> getSignalStrengthResponse_1_6(

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

radio/1.6/vts/functional/radio_response.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1189,7 +1189,8 @@ Return<void> RadioResponse_v1_6::getCellInfoListResponse_1_6( 
}



Return<void> RadioResponse_v1_6::getSystemSelectionChannelsResponse(

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

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

        const hidl_vec<::android::hardware::radio::V1_5::RadioAccessSpecifier>& /*specifier*/) {

    rspInfo = info;

    parent_v1_6.notify(info.serial);

    return Void();