commit 14d88800c9bb058317cfb2620a151f532bfbbad1
author Pengquan Meng <mpq@google.com> Wed Mar 14 23:25:26 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Mar 14 23:25:26 2018 +0000
tree 521b9d4d9f5c9e57b70dea5231aeca9c913fa7b4
parent 7938770f9c9f3608b14116a5237a05c39ab88471
parent 792ba1c1336b91095ec877f4548e489e4eb02e0d

Merge "Reset a network mode of each SIM from system property" into pi-dev

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index ccf2154..16996c0 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -3466,7 +3466,13 @@
                 // Set network selection mode to automatic
                 setNetworkSelectionModeAutomatic(subId);
                 // Set preferred mobile network type to the best available
-                setPreferredNetworkType(subId, Phone.PREFERRED_NT_MODE);
+                String defaultNetwork = TelephonyManager.getTelephonyProperty(
+                        mSubscriptionController.getPhoneId(subId),
+                        "ro.telephony.default_network",
+                        null);
+                int networkType = !TextUtils.isEmpty(defaultNetwork)
+                        ? Integer.parseInt(defaultNetwork) : Phone.PREFERRED_NT_MODE;
+                setPreferredNetworkType(subId, networkType);
                 // Turn off roaming
                 mPhone.setDataRoamingEnabled(false);
                 // Remove IMSI encryption keys from Carrier DB.