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: Icc43e5dc288fd3be824bc1c1cef317f40261cf00
Merged-In: Icc43e5dc288fd3be824bc1c1cef317f40261cf00
diff --git a/guest/hals/ril/reference-libril/ril.h b/guest/hals/ril/reference-libril/ril.h
index 9af8136..77573d8 100644
--- a/guest/hals/ril/reference-libril/ril.h
+++ b/guest/hals/ril/reference-libril/ril.h
@@ -108,10 +108,10 @@
* RIL_REQUEST_RELEASE_PDU_SESSION_ID
* RIL_REQUEST_START_HANDOVER
* RIL_REQUEST_CANCEL_HANDOVER
- * RIL_REQUEST_SET_ALLOWED_NETWORK_TYPE_BITMAP
+ * RIL_REQUEST_SET_ALLOWED_NETWORK_TYPES_BITMAP
* RIL_REQUEST_SET_DATA_THROTTLING
* RIL_REQUEST_GET_SYSTEM_SELECTION_CHANNELS
- * RIL_REQUEST_GET_ALLOWED_NETWORK_TYPE_BITMAP
+ * RIL_REQUEST_GET_ALLOWED_NETWORK_TYPES_BITMAP
* RIL_REQUEST_GET_SLICING_CONFIG
* Updated data structures: RIL_CarrierInfoForImsiEncryption_v16
* New data structure: RIL_PublicKeyType
@@ -7446,7 +7446,7 @@
#define RIL_REQUEST_CANCEL_HANDOVER 164
/**
- * RIL_REQUEST_SET_ALLOWED_NETWORK_TYPE_BITMAP
+ * RIL_REQUEST_SET_ALLOWED_NETWORK_TYPES_BITMAP
*
* Instruct the radio to *only* accept the types of network provided. This
* is stronger than setPreferredNetworkType which is a suggestion.
@@ -7465,7 +7465,7 @@
* NO_RESOURCES
* CANCELLED
*/
-#define RIL_REQUEST_SET_ALLOWED_NETWORK_TYPE_BITMAP 165
+#define RIL_REQUEST_SET_ALLOWED_NETWORK_TYPES_BITMAP 165
/**
* RIL_REQUEST_SET_DATA_THROTTLING
@@ -7495,7 +7495,7 @@
#define RIL_REQUEST_GET_SYSTEM_SELECTION_CHANNELS 167
/**
- * RIL_REQUEST_GET_ALLOWED_NETWORK_TYPE_BITMAP
+ * RIL_REQUEST_GET_ALLOWED_NETWORK_TYPES_BITMAP
*
* Request previously set allowed network types from the radio.
*
@@ -7513,7 +7513,7 @@
* NO_RESOURCES
* CANCELLED
*/
-#define RIL_REQUEST_GET_ALLOWED_NETWORK_TYPE_BITMAP 168
+#define RIL_REQUEST_GET_ALLOWED_NETWORK_TYPES_BITMAP 168
/**
* RIL_REQUEST_GET_SLICING_CONFIG
diff --git a/guest/hals/ril/reference-libril/ril_commands.h b/guest/hals/ril/reference-libril/ril_commands.h
index 0b3b877..4cb950b 100644
--- a/guest/hals/ril/reference-libril/ril_commands.h
+++ b/guest/hals/ril/reference-libril/ril_commands.h
@@ -179,9 +179,9 @@
{RIL_REQUEST_RELEASE_PDU_SESSION_ID, radio_1_6::releasePduSessionIdResponse},
{RIL_REQUEST_START_HANDOVER, radio_1_6::startHandoverResponse},
{RIL_REQUEST_CANCEL_HANDOVER, radio_1_6::cancelHandoverResponse},
- {RIL_REQUEST_SET_ALLOWED_NETWORK_TYPE_BITMAP, radio_1_6::setAllowedNetworkTypeBitmapResponse},
+ {RIL_REQUEST_SET_ALLOWED_NETWORK_TYPES_BITMAP, radio_1_6::setAllowedNetworkTypesBitmapResponse},
{RIL_REQUEST_SET_DATA_THROTTLING, radio_1_6::setDataThrottlingResponse},
{RIL_REQUEST_GET_SYSTEM_SELECTION_CHANNELS, radio_1_6::getSystemSelectionChannelsResponse},
- {RIL_REQUEST_GET_ALLOWED_NETWORK_TYPE_BITMAP, radio_1_6::getAllowedNetworkTypeBitmapResponse},
+ {RIL_REQUEST_GET_ALLOWED_NETWORK_TYPES_BITMAP, radio_1_6::getAllowedNetworkTypesBitmapResponse},
{RIL_REQUEST_GET_SLICING_CONFIG, radio_1_6::getSlicingConfigResponse}
diff --git a/guest/hals/ril/reference-libril/ril_service.cpp b/guest/hals/ril/reference-libril/ril_service.cpp
index 2583ff8..d109c00 100644
--- a/guest/hals/ril/reference-libril/ril_service.cpp
+++ b/guest/hals/ril/reference-libril/ril_service.cpp
@@ -633,7 +633,7 @@
Return<void> releasePduSessionId(int32_t serial, int32_t id);
Return<void> startHandover(int32_t serial, int32_t callId);
Return<void> cancelHandover(int32_t serial, int32_t callId);
- Return<void> setAllowedNetworkTypeBitmap(uint32_t serial,
+ Return<void> setAllowedNetworkTypesBitmap(uint32_t serial,
hidl_bitfield<::android::hardware::radio::V1_4::RadioAccessFamily> networkTypeBitmap);
Return<void> setDataThrottling(int32_t serial,
V1_6::DataThrottlingAction dataThrottlingAction,
@@ -641,7 +641,7 @@
Return<void> getSystemSelectionChannels(int32_t serial);
Return<void> getVoiceRegistrationState_1_6(int32_t serial);
Return<void> getDataRegistrationState_1_6(int32_t serial);
- Return<void> getAllowedNetworkTypeBitmap(uint32_t serial);
+ Return<void> getAllowedNetworkTypesBitmap(uint32_t serial);
Return<void> getSlicingConfig(int32_t serial);
Return<void> setCarrierInfoForImsiEncryption_1_6(
int32_t serial,
@@ -3918,20 +3918,20 @@
return Void();
}
-Return<void> RadioImpl_1_6::setAllowedNetworkTypeBitmap(
+Return<void> RadioImpl_1_6::setAllowedNetworkTypesBitmap(
uint32_t serial, hidl_bitfield<RadioAccessFamily> networkTypeBitmap) {
#if VDBG
- RLOGD("setAllowedNetworkTypeBitmap: serial %d", serial);
+ RLOGD("setAllowedNetworkTypesBitmap: serial %d", serial);
#endif
- dispatchInts(serial, mSlotId, RIL_REQUEST_SET_ALLOWED_NETWORK_TYPE_BITMAP, 1, networkTypeBitmap);
+ dispatchInts(serial, mSlotId, RIL_REQUEST_SET_ALLOWED_NETWORK_TYPES_BITMAP, 1, networkTypeBitmap);
return Void();
}
-Return<void> RadioImpl_1_6::getAllowedNetworkTypeBitmap(uint32_t serial) {
+Return<void> RadioImpl_1_6::getAllowedNetworkTypesBitmap(uint32_t serial) {
#if VDBG
- RLOGD("getAllowedNetworkTypeBitmap: serial %d", serial);
+ RLOGD("getAllowedNetworkTypesBitmap: serial %d", serial);
#endif
- dispatchVoid(serial, mSlotId, RIL_REQUEST_GET_ALLOWED_NETWORK_TYPE_BITMAP);
+ dispatchVoid(serial, mSlotId, RIL_REQUEST_GET_ALLOWED_NETWORK_TYPES_BITMAP);
return Void();
}
@@ -7827,11 +7827,11 @@
return 0;
}
-int radio_1_6::setAllowedNetworkTypeBitmapResponse(int slotId,
+int radio_1_6::setAllowedNetworkTypesBitmapResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
#if VDBG
- RLOGD("setAllowedNetworkTypeBitmapResponse: serial %d", serial);
+ RLOGD("setAllowedNetworkTypesBitmapResponse: serial %d", serial);
#endif
V1_6::RadioResponseInfo responseInfo = {};
@@ -7844,30 +7844,30 @@
}
Return<void> retStatus =
- radioService[slotId]->mRadioResponseV1_6->setAllowedNetworkTypeBitmapResponse(
+ radioService[slotId]->mRadioResponseV1_6->setAllowedNetworkTypesBitmapResponse(
responseInfo);
radioService[slotId]->checkReturnStatus(retStatus);
return 0;
}
-int radio_1_6::getAllowedNetworkTypeBitmapResponse(int slotId,
+int radio_1_6::getAllowedNetworkTypesBitmapResponse(int slotId,
int responseType, int serial, RIL_Errno e,
void *response, size_t responseLen) {
#if VDBG
- RLOGD("getAllowedNetworkTypeBitmapResponse: serial %d", serial);
+ RLOGD("getAllowedNetworkTypesBitmapResponse: serial %d", serial);
#endif
if (radioService[slotId]->mRadioResponseV1_6 != NULL) {
V1_6::RadioResponseInfo responseInfo = {};
int ret = responseInt_1_6(responseInfo, serial, responseType, e, response, responseLen);
Return<void> retStatus
- = radioService[slotId]->mRadioResponseV1_6->getAllowedNetworkTypeBitmapResponse(
+ = radioService[slotId]->mRadioResponseV1_6->getAllowedNetworkTypesBitmapResponse(
responseInfo,
(const ::android::hardware::hidl_bitfield<
::android::hardware::radio::V1_4::RadioAccessFamily>) ret);
radioService[slotId]->checkReturnStatus(retStatus);
} else {
- RLOGE("getAllowedNetworkTypeBitmapResponse: radioService[%d]->mRadioResponseV1_6 == NULL",
+ RLOGE("getAllowedNetworkTypesBitmapResponse: radioService[%d]->mRadioResponseV1_6 == NULL",
slotId);
}
diff --git a/guest/hals/ril/reference-libril/ril_service.h b/guest/hals/ril/reference-libril/ril_service.h
index 0e7aa3b..85bd091 100644
--- a/guest/hals/ril/reference-libril/ril_service.h
+++ b/guest/hals/ril/reference-libril/ril_service.h
@@ -809,13 +809,13 @@
int cancelHandoverResponse(int slotId, int responseType, int serial,
RIL_Errno e, void* response, size_t responseLen);
-int setAllowedNetworkTypeBitmapResponse(int slotId, int responseType, int serial,
+int setAllowedNetworkTypesBitmapResponse(int slotId, int responseType, int serial,
RIL_Errno e, void *response, size_t responselen);
int setDataThrottlingResponse(int slotId, int responseType, int serial,
RIL_Errno e, void *response, size_t responselen);
-int getAllowedNetworkTypeBitmapResponse(int slotId, int responseType, int serial,
+int getAllowedNetworkTypesBitmapResponse(int slotId, int responseType, int serial,
RIL_Errno e, void *response, size_t responselen);
int getSlicingConfigResponse(int slotId, int responseType, int serial,
diff --git a/guest/hals/ril/reference-ril/reference-ril.c b/guest/hals/ril/reference-ril/reference-ril.c
index c80205f..964d52b 100644
--- a/guest/hals/ril/reference-ril/reference-ril.c
+++ b/guest/hals/ril/reference-ril/reference-ril.c
@@ -325,7 +325,7 @@
static RIL_RadioState sState = RADIO_STATE_UNAVAILABLE;
static bool isNrDualConnectivityEnabled = true;
-static unsigned int allowedNetworkTypeBitmap = UINT_MAX;
+static unsigned int allowedNetworkTypesBitmap = UINT_MAX;
static pthread_mutex_t s_state_mutex = PTHREAD_MUTEX_INITIALIZER;
static pthread_cond_t s_state_cond = PTHREAD_COND_INITIALIZER;
@@ -4811,17 +4811,17 @@
case RIL_REQUEST_SET_PREFERRED_NETWORK_TYPE_BITMAP:
requestSetPreferredNetworkType(request, data, datalen, t);
break;
- case RIL_REQUEST_SET_ALLOWED_NETWORK_TYPE_BITMAP:
+ case RIL_REQUEST_SET_ALLOWED_NETWORK_TYPES_BITMAP:
if (data == NULL || datalen != sizeof(int)) {
RIL_onRequestComplete(t, RIL_E_INTERNAL_ERR, NULL, 0);
break;
}
- allowedNetworkTypeBitmap = *(int *)data;
+ allowedNetworkTypesBitmap = *(int *)data;
RIL_onRequestComplete(t, RIL_E_SUCCESS, NULL, 0);
break;
- case RIL_REQUEST_GET_ALLOWED_NETWORK_TYPE_BITMAP:
- RIL_onRequestComplete(t, RIL_E_SUCCESS, &allowedNetworkTypeBitmap,
- sizeof(allowedNetworkTypeBitmap));
+ case RIL_REQUEST_GET_ALLOWED_NETWORK_TYPES_BITMAP:
+ RIL_onRequestComplete(t, RIL_E_SUCCESS, &allowedNetworkTypesBitmap,
+ sizeof(allowedNetworkTypesBitmap));
break;
case RIL_REQUEST_ENABLE_NR_DUAL_CONNECTIVITY:
if (data == NULL || datalen != sizeof(int)) {
