telephony: use default nw mode instead of current when switching subs

Ref: CYNGNOS-1316

Change-Id: I8255152921b005b9635b6f00dc46ac488387bebf
Signed-off-by: Roman Birg <roman@cyngn.com>
(cherry picked from commit 52b8ef0a2a7e0d7d5659d1a20d83ee045c2a167e)

1 files changed, 4 insertions, 2 deletions

diff --git a/src/java/com/android/internal/telephony/SubscriptionController.java b/src/java/com/android/internal/telephony/SubscriptionController.java
index 5b5835bf0..cb2327ccb 100755
--- a/src/java/com/android/internal/telephony/SubscriptionController.java
+++ b/src/java/com/android/internal/telephony/SubscriptionController.java
@@ -1469,8 +1469,10 @@ public class SubscriptionController extends ISub.Stub {
                 if (id == subId) {
                     networkType1 = getUserNwMode(id);
                     if (networkType1 == SubscriptionManager.DEFAULT_NW_MODE) {
-                        /// if user mode is unset, prefer what's set in the db
-                        networkType1 = getNwMode(id);
+                        SubscriptionInfo subInfo = getActiveSubscriptionInfo(subId);
+                        // user mode is unset, prefer the default network mode
+                        networkType1 = TelephonyManager.getTelephonyProperty(
+                                "ro.telephony.default_network", subInfo.getSimSlotIndex(), -1);
                     }
                     phoneId1 = phoneId;
                     if (DBG) logdl("[setDefaultDataSubNetworkType] networkType1: "