commit c41de7768a124adb4f9c03c440fd80855c325885
author Vineeta Srivastava <vsrivastava@google.com> Mon Oct 14 09:56:42 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Oct 14 09:56:42 2013 -0700
tree fe0c708e8fb5fb068cb9ecbc5dd8f402335cd216
parent fba1b3452efeddb3a7c6de9199eb88d55229d0c0
parent 9542969d3b0bfc0c86c2838177378ae470bb0005

am 9542969d: Merge "Delete Network mode setting menu in CDMALte Phone" into klp-dev

* commit '9542969d3b0bfc0c86c2838177378ae470bb0005':
  Delete Network mode setting menu in CDMALte Phone

src/com/android/phone/MobileNetworkSettings.java

diff --git a/src/com/android/phone/MobileNetworkSettings.java b/src/com/android/phone/MobileNetworkSettings.java
index e4b4de6..66824dc 100644
--- a/src/com/android/phone/MobileNetworkSettings.java
+++ b/src/com/android/phone/MobileNetworkSettings.java
@@ -231,22 +231,10 @@
             mCdmaOptions = new CdmaOptions(this, prefSet, mPhone);
             mGsmUmtsOptions = new GsmUmtsOptions(this, prefSet);
         } else {
-            if (!isLteOnCdma) {
-                prefSet.removePreference(mButtonPreferredNetworkMode);
-            }
+            prefSet.removePreference(mButtonPreferredNetworkMode);
             int phoneType = mPhone.getPhoneType();
             if (phoneType == PhoneConstants.PHONE_TYPE_CDMA) {
                 mCdmaOptions = new CdmaOptions(this, prefSet, mPhone);
-                if (isLteOnCdma) {
-                    mButtonPreferredNetworkMode.setOnPreferenceChangeListener(this);
-                    int settingsNetworkMode = android.provider.Settings.Global.getInt(
-                            mPhone.getContext().getContentResolver(),
-                            android.provider.Settings.Global.PREFERRED_NETWORK_MODE,
-                            preferredNetworkMode);
-                    mButtonPreferredNetworkMode.setValue(
-                            Integer.toString(settingsNetworkMode));
-                }
-
             } else if (phoneType == PhoneConstants.PHONE_TYPE_GSM) {
                 mGsmUmtsOptions = new GsmUmtsOptions(this, prefSet);
             } else {