commit af65e4fb687d9412d65f1250cfee7c202e9ef319
author Amit Mahajan <amitmahajan@google.com> Wed Nov 05 15:25:11 2014 -0800
committer Amit Mahajan <amitmahajan@google.com> Wed Nov 05 15:25:11 2014 -0800
tree 4b649d4e6a5e2e078f38808bbbb910e489175a03
parent 2ccd0ac6a7c22e413733bf24c7c04e835445ab65

Change to treat preferred network type LTE as GLOBAL for non CDMA networks.

Bug: 17406959
Change-Id: Ica94bed24a658247ac8670c0c9e1987a3b96a680

src/com/android/phone/MobileNetworkSettings.java

diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index d618b5c..e0986e1 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -693,8 +693,13 @@
                         R.string.preferred_network_mode_lte_cdma_evdo_summary);
                 break;
             case Phone.NT_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
-                mButtonPreferredNetworkMode.setSummary(
-                        R.string.preferred_network_mode_global_summary);
+                if (mIsGlobalCdma) {
+                    mButtonPreferredNetworkMode.setSummary(
+                            R.string.preferred_network_mode_global_summary);
+                } else {
+                    mButtonPreferredNetworkMode.setSummary(
+                            R.string.preferred_network_mode_lte_summary);
+                }
                 break;
             case Phone.NT_MODE_GLOBAL:
                 mButtonPreferredNetworkMode.setSummary(
@@ -780,7 +785,12 @@
             case Phone.NT_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
                 mButtonEnabledNetworks.setValue(
                         Integer.toString(Phone.NT_MODE_LTE_CDMA_EVDO_GSM_WCDMA));
-                mButtonEnabledNetworks.setSummary(R.string.network_global);
+                if (mIsGlobalCdma) {
+                    mButtonEnabledNetworks.setSummary(R.string.network_global);
+                } else {
+                    mButtonEnabledNetworks.setSummary((mShow4GForLTE == true)
+                            ? R.string.network_4G : R.string.network_lte);
+                }
                 break;
             default:
                 String errMsg = "Invalid Network Mode (" + NetworkMode + "). Ignore.";