diff options
| author | Wink Saville <wink@google.com> | 2013-07-01 22:56:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-07-01 22:56:08 +0000 |
| commit | aff0ac4d202934dde7765f7418ea2ad38b0c2faa (patch) | |
| tree | 4c1bc2774462fbea7cba3f17a5805b87ca80d9d0 | |
| parent | e3b94f05b8be2b6305cbee77c23b7f7599bfcff7 (diff) | |
| parent | 97ecc9ec24056259495d2de4d10a4b312d83a57a (diff) | |
| download | base-aff0ac4d202934dde7765f7418ea2ad38b0c2faa.tar.gz | |
Merge "Do not set the network mode differently for LTE+CDMA"
| -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 f92bba029f9c..fbc90e45fdb1 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 |