commit bb25d4841cd69d00e5fc7641f6b167fd821440d0
author SongFerng Wang <songferngwang@google.com> Wed Sep 23 08:49:19 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Sep 23 08:49:19 2020 +0000
tree a804878ef209df35df758d349da82b0d8d492c11
parent 18e1a7c047c076ea2309ff327f61d156f8a9c156
parent 5f5f75cb3d547f86d95a5f3cf8925c734cf6b85d

Merge "Fix for incorrect display of preferred network type on UI"

src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java

diff --git a/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java b/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
index 83fa208..ff6ff59 100644
--- a/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
+++ b/src/com/android/settings/network/telephony/PreferredNetworkModePreferenceController.java
@@ -153,7 +153,7 @@
                 if (mTelephonyManager.getPhoneType() == TelephonyManager.PHONE_TYPE_CDMA
                         || mIsGlobalCdma
                         || MobileNetworkUtils.isWorldMode(mContext, mSubId)) {
-                    return R.string.preferred_network_mode_global_summary;
+                    return R.string.preferred_network_mode_lte_cdma_evdo_gsm_wcdma_summary;
                 } else {
                     return R.string.preferred_network_mode_lte_summary;
                 }
@@ -174,7 +174,7 @@
             case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_GSM_WCDMA:
                 return R.string.preferred_network_mode_nr_lte_gsm_wcdma_summary;
             case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_CDMA_EVDO_GSM_WCDMA:
-                return R.string.preferred_network_mode_nr_lte_cdma_evdo_gsm_wcdma_summary;
+                return R.string.preferred_network_mode_global_summary;
             case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_WCDMA:
                 return R.string.preferred_network_mode_nr_lte_wcdma_summary;
             case TelephonyManagerConstants.NETWORK_MODE_NR_LTE_TDSCDMA: