commit e2be065142dc22f1eea033334f6ba4cf16559e56
author Wink Saville <wink@google.com> Mon Jul 01 16:03:38 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 01 16:03:38 2013 -0700
tree 29d1a9c27a6c7ed091370ac7ff18e113d08c7d6c
parent 3b5d686e683b1811ca90e056065dcf3805bb256a
parent f313da5bfe1953fef509ba6bab7f654516a71509

am f313da5b: am aff0ac4d: Merge "Do not set the network mode differently for LTE+CDMA"

* commit 'f313da5bfe1953fef509ba6bab7f654516a71509':
  Do not set the network mode differently for LTE+CDMA

packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
index 5838526..b65a9a0 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -2239,14 +2239,11 @@
             // Set default cdma call auto retry
             loadSetting(stmt, Settings.Global.CALL_AUTO_RETRY, 0);
 
-            // Set the preferred network mode to 0 = Global, CDMA default
+            // Set the preferred network mode to target desired value or Default
+            // value defined in RILConstants
             int type;
-            if (TelephonyManager.getLteOnCdmaModeStatic() == PhoneConstants.LTE_ON_CDMA_TRUE) {
-                type = Phone.NT_MODE_GLOBAL;
-            } else {
-                type = SystemProperties.getInt("ro.telephony.default_network",
+            type = SystemProperties.getInt("ro.telephony.default_network",
                         RILConstants.PREFERRED_NETWORK_MODE);
-            }
             loadSetting(stmt, Settings.Global.PREFERRED_NETWORK_MODE, type);
 
             // --- New global settings start here