Merge "Add getAllowedNetworkTypesBitmap HAL API" am: a07d055654 am: 3196c429e0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ce4ed340cb791ed5e8c0eb5d87eaa0de09af013
This commit is contained in:
Thiébaud Weksteen 2020-12-15 16:15:51 +00:00 committed by Automerger Merge Worker
commit 9f0ca6fac5
4 changed files with 47 additions and 1 deletions

View file

@ -327,11 +327,25 @@ interface IRadio extends @1.5::IRadio {
* @param serial Serial number of request.
* @param networkTypeBitmap a 32-bit bearer bitmap of RadioAccessFamily
*
* Response callbask is IRadioResponse.setNetworkTypeBitmapResponse()
* Response callback is IRadioResponse.setNetworkTypeBitmapResponse()
*/
oneway setAllowedNetworkTypeBitmap(
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*.
*
* @param serial Serial number of request.
*
* Response callback is IRadioResponse.getNetworkTypeBitmapResponse()
*/
oneway getAllowedNetworkTypeBitmap(uint32_t serial);
/**
* Control data throttling at modem.
* - DataThrottlingAction:NO_DATA_THROTTLING should clear any existing

View file

@ -17,6 +17,7 @@
package android.hardware.radio@1.6;
import @1.0::SendSmsResult;
import @1.4::RadioAccessFamily;
import @1.5::IRadioResponse;
import @1.6::Call;
import @1.6::CellInfo;
@ -310,6 +311,23 @@ interface IRadioResponse extends @1.5::IRadioResponse {
*/
oneway setAllowedNetworkTypeBitmapResponse(RadioResponseInfo info);
/**
* Callback of IRadio.getAllowedNetworkTypeBitmap(int, bitfield<RadioAccessFamily>)
*
* Valid errors returned:
* RadioError:NONE
* RadioError:RADIO_NOT_AVAILABLE
* RadioError:OPERATION_NOT_ALLOWED
* RadioError:MODE_NOT_SUPPORTED
* RadioError:INTERNAL_ERR
* RadioError:INVALID_ARGUMENTS
* RadioError:MODEM_ERR
* RadioError:REQUEST_NOT_SUPPORTED
* RadioError:NO_RESOURCES
*/
oneway getAllowedNetworkTypeBitmapResponse(
RadioResponseInfo info, bitfield<RadioAccessFamily> networkTypeBitmap);
/**
* @param info Response info struct containing response type, serial no. and error
*

View file

@ -793,6 +793,12 @@ class RadioResponse_v1_6 : public ::android::hardware::radio::V1_6::IRadioRespon
Return<void> setAllowedNetworkTypeBitmapResponse(
const ::android::hardware::radio::V1_6::RadioResponseInfo& info);
Return<void> getAllowedNetworkTypeBitmapResponse(
const ::android::hardware::radio::V1_6::RadioResponseInfo& info,
const ::android::hardware::hidl_bitfield<
::android::hardware::radio::V1_4::RadioAccessFamily>
networkTypeBitmap);
Return<void> setDataThrottlingResponse(
const ::android::hardware::radio::V1_6::RadioResponseInfo& info);

View file

@ -1157,6 +1157,14 @@ Return<void> RadioResponse_v1_6::setAllowedNetworkTypeBitmapResponse(
return Void();
}
Return<void> RadioResponse_v1_6::getAllowedNetworkTypeBitmapResponse(
const ::android::hardware::radio::V1_6::RadioResponseInfo& /*info*/,
const ::android::hardware::hidl_bitfield<
::android::hardware::radio::V1_4::RadioAccessFamily>
/*networkTypeBitmap*/) {
return Void();
}
Return<void> RadioResponse_v1_6::setDataThrottlingResponse(
const ::android::hardware::radio::V1_6::RadioResponseInfo& info) {
rspInfo = info;