am 30ece34c: Merge "Set network type to ro.telephony.default_network if hiding preferred network type" into mnc-dr-dev
* commit '30ece34c14768bce32ff42f7484e35c9aa25b013':
Set network type to ro.telephony.default_network if hiding preferred network type
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