Allow getSystemSelectionChannels to return specifiers

Bug: 179929817
Test: VTS
Change-Id: I574e897c0fdb57cad1a3655c34d43f0d080de9ae
Merged-In: I574e897c0fdb57cad1a3655c34d43f0d080de9ae
This commit is contained in:
Sarah Chin
2021-02-12 11:55:15 -08:00
parent a5ec53d68f
commit e52a3943ea
4 changed files with 9 additions and 4 deletions

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.
* 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.
*

View File

@@ -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.

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);
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,

View File

@@ -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();