From 9550951ff96e643d143da826cb9560da572850a1 Mon Sep 17 00:00:00 2001 From: LuK1337 Date: Fri, 21 Oct 2022 20:55:05 +0200 Subject: [PATCH 3/5] Pass correct value to setPreferredNetworkType() for RIL version < 1.4 Change-Id: Id14be66a2ea4e85b6504bc03fd7d2f038185c17d --- src/java/com/android/internal/telephony/RIL.java | 3 ++- .../com/android/internal/telephony/RadioNetworkProxy.java | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/java/com/android/internal/telephony/RIL.java b/src/java/com/android/internal/telephony/RIL.java index 6de66527e1..0c1b7cdf8c 100644 --- a/src/java/com/android/internal/telephony/RIL.java +++ b/src/java/com/android/internal/telephony/RIL.java @@ -2879,7 +2879,8 @@ public class RIL extends BaseCommands implements CommandsInterface { mMetrics.writeSetPreferredNetworkType(mPhoneId, networkType); try { - networkProxy.setPreferredNetworkTypeBitmap(rr.mSerial, mAllowedNetworkTypesBitmask); + networkProxy.setPreferredNetworkTypeBitmap( + rr.mSerial, mAllowedNetworkTypesBitmask, networkType); } catch (RemoteException | RuntimeException e) { handleRadioProxyExceptionForRR(NETWORK_SERVICE, "setPreferredNetworkType", e); } diff --git a/src/java/com/android/internal/telephony/RadioNetworkProxy.java b/src/java/com/android/internal/telephony/RadioNetworkProxy.java index b88103510a..661fa56954 100644 --- a/src/java/com/android/internal/telephony/RadioNetworkProxy.java +++ b/src/java/com/android/internal/telephony/RadioNetworkProxy.java @@ -379,16 +379,17 @@ public class RadioNetworkProxy extends RadioServiceProxy { * Call IRadioNetwork#setPreferredNetworkTypeBitmap * @param serial Serial number of request * @param networkTypesBitmask Preferred network types bitmask to set + * @param networkType Preferred network type to set for RIL version < 1.4 * @throws RemoteException */ - public void setPreferredNetworkTypeBitmap(int serial, int networkTypesBitmask) + public void setPreferredNetworkTypeBitmap(int serial, int networkTypesBitmask, int networkType) throws RemoteException { if (isEmpty() || mHalVersion.greaterOrEqual(RIL.RADIO_HAL_VERSION_1_6)) return; if (mHalVersion.greaterOrEqual(RIL.RADIO_HAL_VERSION_1_4)) { ((android.hardware.radio.V1_4.IRadio) mRadioProxy).setPreferredNetworkTypeBitmap(serial, RILUtils.convertToHalRadioAccessFamily(networkTypesBitmask)); } else { - mRadioProxy.setPreferredNetworkType(serial, networkTypesBitmask); + mRadioProxy.setPreferredNetworkType(serial, networkType); } } -- 2.40.0