commit a2c72e709fa94b893c8c15192d3674d5183eceb2
author Pengquan Meng <mpq@google.com> Thu Mar 08 17:56:28 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 08 17:56:28 2018 +0000
tree b6385b12123c39bdb3a07407390f38f2340f808f
parent 9800507064d63c65440ec10ab4e88f175e2dc73e
parent ab8a69b5ded551dc2410eda870cf5ddb4c9a7cb8

Merge "Reset a network mode of each SIM from system property"

src/com/android/phone/PhoneInterfaceManager.java

diff --git a/src/com/android/phone/PhoneInterfaceManager.java b/src/com/android/phone/PhoneInterfaceManager.java
index b70f9eb..7b16888 100755
--- a/src/com/android/phone/PhoneInterfaceManager.java
+++ b/src/com/android/phone/PhoneInterfaceManager.java
@@ -3436,7 +3436,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);
             }