commit ddb8d5fe19f6c55ad2f60d94cbaf94fa15823023
author Santos Cordon <santoscordon@google.com> Wed Sep 23 18:31:07 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 23 18:31:07 2015 +0000
tree 1bb02844933d068a766d4946b9034a353f000976
parent aefd749b5dc2e420a769b5e737fc6d1177643f46
parent 3ba1419ade788f717dc2beb9667224dc9ed2e317

Merge "Double-check SIP state before issuing a swap-calls command."

src/com/android/phone/MobileNetworkSettings.java

diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index 8693044..1d8ceb0 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -1166,6 +1166,7 @@
             case Phone.NT_MODE_LTE_TDSCDMA:
             case Phone.NT_MODE_LTE_TDSCDMA_WCDMA:
             case Phone.NT_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA:
+            case Phone.NT_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
                 if (getResources().getBoolean(R.bool.config_support_tdscdma)) {
                     mButtonEnabledNetworks.setValue(
                             Integer.toString(Phone.NT_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA));
@@ -1187,22 +1188,6 @@
                     }
                 }
                 break;
-            case Phone.NT_MODE_LTE_CDMA_EVDO_GSM_WCDMA:
-                if (isWorldMode()) {
-                    controlCdmaOptions(true);
-                    controlGsmOptions(false);
-                }
-                mButtonEnabledNetworks.setValue(
-                        Integer.toString(Phone.NT_MODE_LTE_CDMA_EVDO_GSM_WCDMA));
-                if (mPhone.getPhoneType() == PhoneConstants.PHONE_TYPE_CDMA ||
-                        mIsGlobalCdma ||
-                        isWorldMode()) {
-                    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.";
                 loge(errMsg);