diff options
| author | Naveen Kalla <nkalla@codeaurora.org> | 2012-07-13 20:10:22 -0700 |
|---|---|---|
| committer | Naveen Kalla <nkalla@codeaurora.org> | 2013-07-01 11:16:38 -0700 |
| commit | 97ecc9ec24056259495d2de4d10a4b312d83a57a (patch) | |
| tree | 4c1bc2774462fbea7cba3f17a5805b87ca80d9d0 /packages/SettingsProvider | |
| parent | e3b94f05b8be2b6305cbee77c23b7f7599bfcff7 (diff) | |
| download | frameworks_base-97ecc9ec24056259495d2de4d10a4b312d83a57a.zip frameworks_base-97ecc9ec24056259495d2de4d10a4b312d83a57a.tar.gz frameworks_base-97ecc9ec24056259495d2de4d10a4b312d83a57a.tar.bz2 | |
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
Diffstat (limited to 'packages/SettingsProvider')
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 9 |
1 files changed, 3 insertions, 6 deletions
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 |