54 lines
2.7 KiB
Diff
54 lines
2.7 KiB
Diff
From b299cb6cb26268d1a0a58b8df42ea334d7bdc950 Mon Sep 17 00:00:00 2001
|
|
From: LuK1337 <priv.luk@gmail.com>
|
|
Date: Fri, 21 Oct 2022 20:55:05 +0200
|
|
Subject: [PATCH 2/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 5ecdfcbbd4..174b89c141 100644
|
|
--- a/src/java/com/android/internal/telephony/RIL.java
|
|
+++ b/src/java/com/android/internal/telephony/RIL.java
|
|
@@ -3027,7 +3027,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(HAL_SERVICE_NETWORK, "setPreferredNetworkType", e);
|
|
}
|
|
diff --git a/src/java/com/android/internal/telephony/RadioNetworkProxy.java b/src/java/com/android/internal/telephony/RadioNetworkProxy.java
|
|
index 246c2e0204..2e352a96b4 100644
|
|
--- a/src/java/com/android/internal/telephony/RadioNetworkProxy.java
|
|
+++ b/src/java/com/android/internal/telephony/RadioNetworkProxy.java
|
|
@@ -389,16 +389,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.41.0
|
|
|