commit 195bb80c1d1baeacd9433869c06434771f7ea780
author Jordan Liu <jminjie@google.com> Wed Jun 06 20:26:26 2018 +0000
committer Jordan Liu <jminjie@google.com> Wed Jun 06 21:44:36 2018 +0000
tree 4a4bc7280a485eb246434890f15a64225db08090
parent cadd9cd61eede63bc93ab1cc03010240a8953946

Revert "Use resource instead of carrier config"

This reverts commit cadd9cd61eede63bc93ab1cc03010240a8953946.

Test: manually verified locally that the Preferred Network Type menu
shows only three options
Fixes: 109773307
Bug: 80541766
Bug: 70309465
Bug: 80088968
Change-Id: Ia4238133f2f34998ef44f5f2cfd616ea3f7a50c1

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