commit ab8a69b5ded551dc2410eda870cf5ddb4c9a7cb8
author Kitta Koutarou <koutarou.x.kitta@sonymobile.com> Mon Mar 05 14:16:45 2018 +0900
committer takeshi tanigawa <takeshi.tanigawa@sony.com> Tue Mar 06 03:25:16 2018 +0000
tree ba117139eab4dddf9253c0e94abf118712bd6d25
parent de067d0987e62990f6875f5fd5165043565b46e4

Reset a network mode of each SIM from system property

Network mode should be reset to default from system property by SIM when
network reset is done.

Bug: 28384694
Test: manual - Checked if the network mode is reset to default when
network reset was done.
Change-Id: I666bdb6cec121094576a4a370d7f6c86a111e146

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);
             }