From 97ecc9ec24056259495d2de4d10a4b312d83a57a Mon Sep 17 00:00:00 2001 From: Naveen Kalla Date: Fri, 13 Jul 2012 20:10:22 -0700 Subject: Do not set the network mode differently for LTE+CDMA ro.telephony.default_network can be set if needed to set a different value for LTE+CDMA. No need to hardcode preferred network mode in the source code. Change-Id: Iae65f72a6a3bc31d500c5ecec87368a6f2a5d117 --- .../src/com/android/providers/settings/DatabaseHelper.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'packages/SettingsProvider') diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index f92bba0..fbc90e4 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -2225,14 +2225,11 @@ public class DatabaseHelper extends SQLiteOpenHelper { // 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 -- cgit v1.1