commit d5649a8190b709ae82741c61cbc753388b3abd7a
author Richard Chang <richardwychang@google.com> Tue Aug 02 05:59:25 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Aug 02 05:59:25 2022 +0000
tree 0f19ae4df157d65522e125129e328d7b7ec3ddc3
parent 98b50d691840c5d5cbd82931d1cbf445c51ad047
parent 9693b3447b3671a3ba7f3039a021a6b5202d2a88

Replace TelephonyManager method for get preferred network type. am: d0979719b4 am: 0f78fdf8b9 am: 4b140bdc03 am: 9693b3447b

Original change: https://android-review.googlesource.com/c/platform/external/sl4a/+/2171286

Change-Id: I083809df3f43aeea212fe9fbad419c300049e501
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Common/src/com/googlecode/android_scripting/facade/telephony/TelephonyManagerFacade.java

diff --git a/Common/src/com/googlecode/android_scripting/facade/telephony/TelephonyManagerFacade.java b/Common/src/com/googlecode/android_scripting/facade/telephony/TelephonyManagerFacade.java
index e60e5f1..33a573b 100644
--- a/Common/src/com/googlecode/android_scripting/facade/telephony/TelephonyManagerFacade.java
+++ b/Common/src/com/googlecode/android_scripting/facade/telephony/TelephonyManagerFacade.java
@@ -32,6 +32,7 @@
 import android.telephony.CellLocation;
 import android.telephony.NeighboringCellInfo;
 import android.telephony.PhoneStateListener;
+import android.telephony.RadioAccessFamily;
 import android.telephony.ServiceState;
 import android.telephony.SignalStrength;
 import android.telephony.SubscriptionManager;
@@ -190,7 +191,10 @@
     @Rpc(description = "Get network preference for subscription.")
     public String telephonyGetPreferredNetworkTypesForSubscription(
             @RpcParameter(name = "subId") Integer subId) {
-        int networkPreferenceInt = mTelephonyManager.getPreferredNetworkType(subId);
+        int networkPreferenceInt =
+            RadioAccessFamily.getNetworkTypeFromRaf(
+                (int) mTelephonyManager.createForSubscriptionId(
+                    subId).getAllowedNetworkTypesBitmask());
         return TelephonyUtils.getNetworkModeStringfromInt(networkPreferenceInt);
     }