Merge "radiocompat: Use functions from IRadio 1.4 to set/get network types" into main am: 2da647bec4
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/3549360
Change-Id: I4770797a3b8a2b78383b6cc8e322eb3335c6f9df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/radio/aidl/compat/libradiocompat/network/RadioNetwork.cpp b/radio/aidl/compat/libradiocompat/network/RadioNetwork.cpp
index b5aee5c..41200f9 100644
--- a/radio/aidl/compat/libradiocompat/network/RadioNetwork.cpp
+++ b/radio/aidl/compat/libradiocompat/network/RadioNetwork.cpp
@@ -41,7 +41,7 @@
if (mHal1_6) {
mHal1_6->getAllowedNetworkTypesBitmap(serial);
} else {
- mHal1_5->getPreferredNetworkType(serial);
+ mHal1_5->getPreferredNetworkTypeBitmap(serial);
}
return ok();
}
@@ -166,7 +166,7 @@
if (mHal1_6) {
mHal1_6->setAllowedNetworkTypesBitmap(serial, raf);
} else {
- mHal1_5->setPreferredNetworkType(serial, getNetworkTypeFromRaf(raf));
+ mHal1_5->setPreferredNetworkTypeBitmap(serial, raf);
}
return ok();
}
diff --git a/radio/aidl/compat/libradiocompat/network/RadioResponse-network.cpp b/radio/aidl/compat/libradiocompat/network/RadioResponse-network.cpp
index 5a98eb2..428070c 100644
--- a/radio/aidl/compat/libradiocompat/network/RadioResponse-network.cpp
+++ b/radio/aidl/compat/libradiocompat/network/RadioResponse-network.cpp
@@ -55,9 +55,10 @@
}
Return<void> RadioResponse::getPreferredNetworkTypeBitmapResponse(
- const V1_0::RadioResponseInfo& info, hidl_bitfield<V1_4::RadioAccessFamily>) {
+ const V1_0::RadioResponseInfo& info,
+ hidl_bitfield<V1_4::RadioAccessFamily> networkTypeBitmap) {
LOG_CALL << info.serial;
- LOG(ERROR) << "IRadio HAL 1.4 not supported";
+ networkCb()->getAllowedNetworkTypesBitmapResponse(toAidl(info), networkTypeBitmap);
return {};
}
@@ -290,7 +291,7 @@
Return<void> RadioResponse::setPreferredNetworkTypeBitmapResponse(
const V1_0::RadioResponseInfo& info) {
LOG_CALL << info.serial;
- LOG(ERROR) << "IRadio HAL 1.4 not supported";
+ networkCb()->setAllowedNetworkTypesBitmapResponse(toAidl(info));
return {};
}