Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-02 02:42:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename AllowedNetworkType to AllowedNetworkTypes

Browse Source 
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
This commit is contained in:
SongFerngWang
2021-01-26 03:08:48 +08:00
parent 947b82bee2
commit f92b61c2db
4 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
radio/1.6/IRadio.hal
View File

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

10
radio/1.6/IRadioResponse.hal
View File

@@ -298,7 +298,7 @@ interface IRadioResponse extends @1.5::IRadioResponse {
oneway cancelHandoverResponse(RadioResponseInfo info);
/**
* Callback of IRadio.setAllowedNetworkTypeBitmap(int, bitfield<RadioAccessFamily>)
* Callback of IRadio.setAllowedNetworkTypesBitmap(int, bitfield<RadioAccessFamily>)
*
* 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<RadioAccessFamily>)
* Callback of IRadio.getAllowedNetworkTypesBitmap(int, bitfield<RadioAccessFamily>)
* @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<RadioAccessFamily> networkTypeBitmap);
/**

4
radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h
View File

@@ -792,10 +792,10 @@ class RadioResponse_v1_6 : public ::android::hardware::radio::V1_6::IRadioRespon
Return<void> cancelHandoverResponse(
const ::android::hardware::radio::V1_6::RadioResponseInfo& info);
Return<void> setAllowedNetworkTypeBitmapResponse(
Return<void> setAllowedNetworkTypesBitmapResponse(
const ::android::hardware::radio::V1_6::RadioResponseInfo& info);
Return<void> getAllowedNetworkTypeBitmapResponse(
Return<void> getAllowedNetworkTypesBitmapResponse(
const ::android::hardware::radio::V1_6::RadioResponseInfo& info,
const ::android::hardware::hidl_bitfield<
::android::hardware::radio::V1_4::RadioAccessFamily>

4
radio/1.6/vts/functional/radio_response.cpp
View File

@@ -1154,14 +1154,14 @@ Return<void> RadioResponse_v1_6::cancelHandoverResponse(
return Void();
}
Return<void> RadioResponse_v1_6::setAllowedNetworkTypeBitmapResponse(
Return<void> RadioResponse_v1_6::setAllowedNetworkTypesBitmapResponse(
const ::android::hardware::radio::V1_6::RadioResponseInfo& info) {
rspInfo = info;
parent_v1_6.notify(info.serial);
return Void();
}
Return<void> RadioResponse_v1_6::getAllowedNetworkTypeBitmapResponse(
Return<void> RadioResponse_v1_6::getAllowedNetworkTypesBitmapResponse(
const ::android::hardware::radio::V1_6::RadioResponseInfo& /*info*/,
const ::android::hardware::hidl_bitfield<
::android::hardware::radio::V1_4::RadioAccessFamily>