commit 56b1bf1ed1a0d62d02eb5b3c04bfb0b08539c06b
author Roshan Pius <rpius@google.com> Wed Aug 12 03:25:05 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Aug 12 03:25:05 2015 +0000
tree 77b6ad3aeda0b7d439556cbcc80735daeec31335
parent 94846fea8b88b76955982112cb4d0e3ce6672e51
parent f5992d586d7e25fafe5f271388a179e24ade75d8

Merge "Purge invalid SIP phone accounts at startup." into mnc-dev

src/com/android/phone/MobileNetworkSettings.java

diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index ad9032f..cf928ae 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -992,7 +992,9 @@
                         R.string.preferred_network_mode_lte_cdma_evdo_summary);
                 break;
             case Phone.NT_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
-                if (mPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA) {
+                if (mPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA ||
+                        mIsGlobalCdma ||
+                        isWorldMode()) {
                     mButtonPreferredNetworkMode.setSummary(
                             R.string.preferred_network_mode_global_summary);
                 } else {
@@ -1092,7 +1094,9 @@
                 }
                 mButtonEnabledNetworks.setValue(
                         Integer.toString(Phone.NT_MODE_LTE_CDMA_EVDO_GSM_WCDMA));
-                if (mPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA) {
+                if (mPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA ||
+                        mIsGlobalCdma ||
+                        isWorldMode()) {
                     mButtonEnabledNetworks.setSummary(R.string.network_global);
                 } else {
                     mButtonEnabledNetworks.setSummary((mShow4GForLTE == true)