commit da19cf883036a0d2396289cdaea29b2875379d19
author Sungmin Choi <sungmin.choi@lge.com> Fri Oct 16 00:30:29 2015 -0700
committer Sanket Padawe <sanketpadawe@google.com> Fri Oct 16 13:59:23 2015 -0700
tree cdac6393d8dc6ffbb242e3a0cabfcea6aa13ce52
parent 67c3279ef96d40cdef4f203f33044affc168a502

Set network type to ro.telephony.default_network if hiding preferred network type

Since pref is being hidden from user, set network mode to default
in case it is currently something else. That is possible if user
changed the setting while roaming and is now back to home network.

Bug: 25012603
Change-Id: I2bdf92a3c62a2d2e995f74285a77b33be70cd82f

src/com/android/phone/MobileNetworkSettings.java

diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index aa78204..c94bf4c 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -569,6 +569,10 @@
             } else {
                 throw new IllegalStateException("Unexpected phone type: " + phoneType);
             }
+            // Since pref is being hidden from user, set network mode to default
+            // in case it is currently something else. That is possible if user
+            // changed the setting while roaming and is now back to home network.
+            settingsNetworkMode = preferredNetworkMode;
         } else if (carrierConfig.getBoolean(CarrierConfigManager.KEY_WORLD_PHONE_BOOL) == true) {
             prefSet.removePreference(mButtonEnabledNetworks);
             // set the listener for the mButtonPreferredNetworkMode list preference so we can issue