tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Allow getSystemSelectionChannels to return specifiers" am: c3325707a5 am: 3e8439d5ec

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idcf32fd1c720c3f08ecfc3fe16582ca9f121fa33
This commit is contained in:
Sarah Chin 2021-02-19 02:32:42 +00:00 committed by Automerger Merge Worker
commit 6a0a1a18d5
4 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
radio/1.6/IRadio.hal
View file

@ -453,7 +453,7 @@ interface IRadio extends @1.5::IRadio {
* cell information isn't known then the appropriate unknown value will be returned. * 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 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. * @param serial Serial number of request.
* *

5
radio/1.6/IRadioResponse.hal
View file

@ -19,6 +19,7 @@ package android.hardware.radio@1.6;
import @1.0::SendSmsResult; import @1.0::SendSmsResult;
import @1.4::RadioAccessFamily; import @1.4::RadioAccessFamily;
import @1.5::IRadioResponse; import @1.5::IRadioResponse;
import @1.5::RadioAccessSpecifier;
import @1.6::Call; import @1.6::Call;
import @1.6::CellInfo; import @1.6::CellInfo;
import @1.6::RegStateResult; 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 info Response info struct containing response type, serial no. and error
* @param specifiers List of RadioAccessSpecifiers that are scanned.
* *
* Valid errors returned: * Valid errors returned:
* RadioError:NONE * RadioError:NONE
@ -348,7 +350,8 @@ interface IRadioResponse extends @1.5::IRadioResponse {
* RadioError:INTERNAL_ERR * RadioError:INTERNAL_ERR
* RadioError:INVALID_ARGUMENTS * 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. * This is identical to getCellInfoListResponse_1_5 but uses an updated version of CellInfo.

3
radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h
View file

@ -804,7 +804,8 @@ class RadioResponse_v1_6 : public ::android::hardware::radio::V1_6::IRadioRespon
const ::android::hardware::radio::V1_6::RadioResponseInfo& info); const ::android::hardware::radio::V1_6::RadioResponseInfo& info);
Return<void> getSystemSelectionChannelsResponse( 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( Return<void> getSignalStrengthResponse_1_6(
const ::android::hardware::radio::V1_6::RadioResponseInfo& info, const ::android::hardware::radio::V1_6::RadioResponseInfo& info,

3
radio/1.6/vts/functional/radio_response.cpp
View file

@ -1189,7 +1189,8 @@ Return<void> RadioResponse_v1_6::getCellInfoListResponse_1_6(
} }
Return<void> RadioResponse_v1_6::getSystemSelectionChannelsResponse( 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; rspInfo = info;
parent_v1_6.notify(info.serial); parent_v1_6.notify(info.serial);
return Void(); return Void();