summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThiƩbaud Weksteen <tweek@google.com>2020-11-05 19:32:59 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-11-05 19:32:59 +0000
commit2df6ba0ac23b2f3f0820dcf6f0c6e44330ca2021 (patch)
tree8ad3417624f10a2446040891203298ca3151cf34
parentf72c5c861e459ddfb9a661ef272232f2e936a66c (diff)
parent5ae16f33f3be458656d2a1c955d2cf05a2758efb (diff)
downloadplatform_hardware_interfaces-2df6ba0ac23b2f3f0820dcf6f0c6e44330ca2021.tar.gz
platform_hardware_interfaces-2df6ba0ac23b2f3f0820dcf6f0c6e44330ca2021.tar.bz2
platform_hardware_interfaces-2df6ba0ac23b2f3f0820dcf6f0c6e44330ca2021.zip
Merge "Add setAllowedNetworkTypeBitmap"
-rw-r--r--radio/1.6/IRadio.hal15
-rw-r--r--radio/1.6/IRadioResponse.hal16
-rw-r--r--radio/1.6/vts/functional/radio_hidl_hal_utils_v1_6.h5
-rw-r--r--radio/1.6/vts/functional/radio_response.cpp7
4 files changed, 42 insertions, 1 deletions
diff --git a/radio/1.6/IRadio.hal b/radio/1.6/IRadio.hal
index eb20542e7e..747b2f2ddc 100644
--- a/radio/1.6/IRadio.hal
+++ b/radio/1.6/IRadio.hal
@@ -21,6 +21,7 @@ import @1.0::CdmaSmsMessage;
import @1.0::GsmSmsMessage;
import @1.1::CardPowerState;
import @1.2::DataRequestReason;
+import @1.4::RadioAccessFamily;
import @1.5::IRadio;
import @1.5::AccessNetwork;
import @1.5::DataProfileInfo;
@@ -305,4 +306,18 @@ interface IRadio extends @1.5::IRadio {
* Response function is IRadioResponse.cancelHandoverResponse()
*/
oneway cancelHandover(int32_t serial, int32_t callId);
+
+ /**
+ * 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.
+ *
+ * @param serial Serial number of request.
+ * @param networkTypeBitmap a 32-bit bearer bitmap of RadioAccessFamily
+ *
+ * Response callbask is IRadioResponse.setNetworkTypeBitmapResponse()
+ */
+ oneway setAllowedNetworkTypeBitmap(
+ uint32_t serial, bitfield<RadioAccessFamily> networkTypeBitmap);
};
diff --git a/radio/1.6/IRadioResponse.hal b/radio/1.6/IRadioResponse.hal
index 07322be29b..523185eab0 100644
--- a/radio/1.6/IRadioResponse.hal
+++ b/radio/1.6/IRadioResponse.hal
@@ -290,4 +290,20 @@ interface IRadioResponse extends @1.5::IRadioResponse {
* RadioError:INVALID_CALL_ID
*/
oneway cancelHandoverResponse(RadioResponseInfo info);
+
+ /**
+ * Callback of IRadio.setAllowedNetworkTypeBitmap(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 setAllowedNetworkTypeBitmapResponse(RadioResponseInfo info);
};
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 850425dbe4..5682f11da4 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
@@ -58,7 +58,7 @@ using ::android::hardware::Void;
class RadioHidlTest_v1_6;
extern ::android::hardware::radio::V1_5::CardStatus cardStatus;
-/* Callback class for radio response v1_5 */
+/* Callback class for radio response v1_6 */
class RadioResponse_v1_6 : public ::android::hardware::radio::V1_6::IRadioResponse {
protected:
RadioHidlTest_v1_6& parent_v1_6;
@@ -789,6 +789,9 @@ 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(
+ const ::android::hardware::radio::V1_6::RadioResponseInfo& info);
};
/* Callback class for radio indication */
diff --git a/radio/1.6/vts/functional/radio_response.cpp b/radio/1.6/vts/functional/radio_response.cpp
index fc56947f50..dc4f57db3d 100644
--- a/radio/1.6/vts/functional/radio_response.cpp
+++ b/radio/1.6/vts/functional/radio_response.cpp
@@ -1149,3 +1149,10 @@ Return<void> RadioResponse_v1_6::cancelHandoverResponse(
parent_v1_6.notify(info.serial);
return Void();
}
+
+Return<void> RadioResponse_v1_6::setAllowedNetworkTypeBitmapResponse(
+ const ::android::hardware::radio::V1_6::RadioResponseInfo& info) {
+ rspInfo = info;
+ parent_v1_6.notify(info.serial);
+ return Void();
+}