commit 068670def068be918b64f6a6ea7df797c3959208
author Jordan Liu <jminjie@google.com> Wed Jun 06 22:51:13 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 06 22:51:13 2018 +0000
tree 9b49f26684ee42ebe8f71709150e25817dbbe0dc
parent 802dcd4898b7a840151e04ba6cc7e2de4e0594eb
parent 195bb80c1d1baeacd9433869c06434771f7ea780

Merge "Revert "Use resource instead of carrier config"" into pi-dev

src/com/android/phone/MobileNetworkSettings.java

diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index 66c5650..691d9ff 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -1011,7 +1011,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.
@@ -1897,7 +1898,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);