From f92b61c2db853fc032bbf930e82e1dd59d4214b8 Mon Sep 17 00:00:00 2001 From: SongFerngWang Date: Tue, 26 Jan 2021 03:08:48 +0800 Subject: [PATCH] Rename AllowedNetworkType to AllowedNetworkTypes Reference the ag/q/topic:%22b_171791177%22+(status:open%20OR%20status:merged) and ag/q/topic:"getAllowedNetworkTypeBitmap"+(status:open%20OR%20status:merged) Bug: 161434786 Test: build pass Change-Id: Iee919a40153f680d6a8b81dc88d8fa2bd1e8d343 Merged-In: Iee919a40153f680d6a8b81dc88d8fa2bd1e8d343 --- radio/1.6/IRadio.hal | 19 +++++++++---------- radio/1.6/IRadioResponse.hal | 10 ++++++---- .../functional/radio_hidl_hal_utils_v1_6.h | 4 ++-- radio/1.6/vts/functional/radio_response.cpp | 4 ++-- 4 files changed, 19 insertions(+), 18 deletions(-) diff --git a/radio/1.6/IRadio.hal b/radio/1.6/IRadio.hal index e7267ef8a9..714be47571 100644 --- a/radio/1.6/IRadio.hal +++ b/radio/1.6/IRadio.hal @@ -340,8 +340,9 @@ interface IRadio extends @1.5::IRadio { /** * Requests to set the network type for searching and registering. * - * Instruct the radio to *only* accept the types of network provided. This - * is stronger than setPreferredNetworkType which is a suggestion. + * Instruct the radio to *only* accept the types of network provided. + * setPreferredNetworkType, setPreferredNetworkTypesBitmap will not be called anymore + * except for IRadio v1.5 or older devices. * * In case of an emergency call, the modem is authorized to bypass this * restriction. @@ -349,24 +350,22 @@ interface IRadio extends @1.5::IRadio { * @param serial Serial number of request. * @param networkTypeBitmap a 32-bit bearer bitmap of RadioAccessFamily * - * Response callback is IRadioResponse.setNetworkTypeBitmapResponse() + * Response callback is IRadioResponse.setAllowedNetworkTypesBitmapResponse() */ - oneway setAllowedNetworkTypeBitmap( + oneway setAllowedNetworkTypesBitmap( uint32_t serial, bitfield networkTypeBitmap); /** * Requests bitmap representing the currently allowed network types. * - * Requests the bitmap set by the corresponding method - * setAllowedNetworkTypeBitmap, which sets a strict set of RATs for the - * radio to use. Differs from getPreferredNetworkType and getPreferredNetworkTypeBitmap - * in that those request *preferences*. + * getPreferredNetworkType, getPreferredNetworkTypesBitmap will not be called anymore + * except for IRadio v1.5 or older devices. * * @param serial Serial number of request. * - * Response callback is IRadioResponse.getNetworkTypeBitmapResponse() + * Response callback is IRadioResponse.getAllowedNetworkTypesBitmapResponse() */ - oneway getAllowedNetworkTypeBitmap(uint32_t serial); + oneway getAllowedNetworkTypesBitmap(uint32_t serial); /** * Control data throttling at modem. diff --git a/radio/1.6/IRadioResponse.hal b/radio/1.6/IRadioResponse.hal index a4744e16de..56ce809dfe 100644 --- a/radio/1.6/IRadioResponse.hal +++ b/radio/1.6/IRadioResponse.hal @@ -298,7 +298,7 @@ interface IRadioResponse extends @1.5::IRadioResponse { oneway cancelHandoverResponse(RadioResponseInfo info); /** - * Callback of IRadio.setAllowedNetworkTypeBitmap(int, bitfield) + * Callback of IRadio.setAllowedNetworkTypesBitmap(int, bitfield) * * Valid errors returned: * RadioError:NONE @@ -311,10 +311,12 @@ interface IRadioResponse extends @1.5::IRadioResponse { * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES */ - oneway setAllowedNetworkTypeBitmapResponse(RadioResponseInfo info); + oneway setAllowedNetworkTypesBitmapResponse(RadioResponseInfo info); /** - * Callback of IRadio.getAllowedNetworkTypeBitmap(int, bitfield) + * Callback of IRadio.getAllowedNetworkTypesBitmap(int, bitfield) + * @param info Response info struct containing response type, serial no. and error + * @param networkTypeBitmap a 32-bit bitmap of RadioAccessFamily. * * Valid errors returned: * RadioError:NONE @@ -327,7 +329,7 @@ interface IRadioResponse extends @1.5::IRadioResponse { * RadioError:REQUEST_NOT_SUPPORTED * RadioError:NO_RESOURCES */ - oneway getAllowedNetworkTypeBitmapResponse( + oneway getAllowedNetworkTypesBitmapResponse( RadioResponseInfo info, bitfield networkTypeBitmap); /** 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 f3eaed6be3..f610f2af76 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 @@ -792,10 +792,10 @@ class RadioResponse_v1_6 : public ::android::hardware::radio::V1_6::IRadioRespon Return cancelHandoverResponse( const ::android::hardware::radio::V1_6::RadioResponseInfo& info); - Return setAllowedNetworkTypeBitmapResponse( + Return setAllowedNetworkTypesBitmapResponse( const ::android::hardware::radio::V1_6::RadioResponseInfo& info); - Return getAllowedNetworkTypeBitmapResponse( + Return getAllowedNetworkTypesBitmapResponse( const ::android::hardware::radio::V1_6::RadioResponseInfo& info, const ::android::hardware::hidl_bitfield< ::android::hardware::radio::V1_4::RadioAccessFamily> diff --git a/radio/1.6/vts/functional/radio_response.cpp b/radio/1.6/vts/functional/radio_response.cpp index 23d57afc2a..027e9acd74 100644 --- a/radio/1.6/vts/functional/radio_response.cpp +++ b/radio/1.6/vts/functional/radio_response.cpp @@ -1154,14 +1154,14 @@ Return RadioResponse_v1_6::cancelHandoverResponse( return Void(); } -Return RadioResponse_v1_6::setAllowedNetworkTypeBitmapResponse( +Return RadioResponse_v1_6::setAllowedNetworkTypesBitmapResponse( const ::android::hardware::radio::V1_6::RadioResponseInfo& info) { rspInfo = info; parent_v1_6.notify(info.serial); return Void(); } -Return RadioResponse_v1_6::getAllowedNetworkTypeBitmapResponse( +Return RadioResponse_v1_6::getAllowedNetworkTypesBitmapResponse( const ::android::hardware::radio::V1_6::RadioResponseInfo& /*info*/, const ::android::hardware::hidl_bitfield< ::android::hardware::radio::V1_4::RadioAccessFamily>