Merge "Revert "Use resource instead of carrier config""
am: e3021c3971
Change-Id: I95890f73884adc758411ee9f319c9914971ab299
diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index 1f406ea..78e647a 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -942,7 +942,8 @@
// 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 (isWorldMode()) {
+ } 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
// change Preferred Network Mode.
@@ -1823,7 +1824,6 @@
return super.onOptionsItemSelected(item);
}
- // TODO: b/80541766 this should use the carrier config, not the resource overlay
private boolean isWorldMode() {
boolean worldModeOn = false;
final String configString = getResources().getString(R.string.config_world_mode);