diff options
| author | Sarah Chin <sarahchin@google.com> | 2021-02-19 00:34:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-02-19 00:34:29 +0000 |
| commit | c3325707a552b8b13a044fed1b5de2888f28f7cd (patch) | |
| tree | 9d2826057e0e62ed2cf330bb2488ce5996e06c6c | |
| parent | 721de0e84a407f53754f5ae52ac6693583aaf485 (diff) | |
| parent | e52a3943ead86615d47e89a64e1ea8db899791cc (diff) | |
Merge "Allow getSystemSelectionChannels to return specifiers"
| -rw-r--r-- | radio/1.6/IRadio.hal | 2 | ||||
| -rw-r--r-- | radio/1.6/IRadioResponse.hal | 5 | ||||
| -rw-r--r-- | radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h | 3 | ||||
| -rw-r--r-- | radio/1.6/vts/functional/radio_response.cpp | 3 |
4 files changed, 9 insertions, 4 deletions
diff --git a/radio/1.6/IRadio.hal b/radio/1.6/IRadio.hal index df2894045f..c83de2985c 100644 --- a/radio/1.6/IRadio.hal +++ b/radio/1.6/IRadio.hal @@ -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. * diff --git a/radio/1.6/IRadioResponse.hal b/radio/1.6/IRadioResponse.hal index 6ac86c335e..a1ad20726c 100644 --- a/radio/1.6/IRadioResponse.hal +++ b/radio/1.6/IRadioResponse.hal @@ -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. diff --git a/radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h b/radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h index db067d75a0..b94cd96b7d 100644 --- a/radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h +++ b/radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h @@ -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, diff --git a/radio/1.6/vts/functional/radio_response.cpp b/radio/1.6/vts/functional/radio_response.cpp index ba84fd45b3..feb9e03ee6 100644 --- a/radio/1.6/vts/functional/radio_response.cpp +++ b/radio/1.6/vts/functional/radio_response.cpp @@ -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(); |