diff options
| author | Wink Saville <wink@google.com> | 2013-07-01 17:01:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-07-01 17:01:23 -0700 |
| commit | 0bc2fe425dcc0873863cdcd7bd76a33fd4193088 (patch) | |
| tree | ecd6ef9bcd646c07e82068425b7a6649a48f514e /packages | |
| parent | 9f6a7f424fad614fdb991bd978009eb1321c70a6 (diff) | |
| parent | e2be065142dc22f1eea033334f6ba4cf16559e56 (diff) | |
| download | frameworks_base-0bc2fe425dcc0873863cdcd7bd76a33fd4193088.zip frameworks_base-0bc2fe425dcc0873863cdcd7bd76a33fd4193088.tar.gz frameworks_base-0bc2fe425dcc0873863cdcd7bd76a33fd4193088.tar.bz2 | |
am e2be0651: am f313da5b: am aff0ac4d: Merge "Do not set the network mode differently for LTE+CDMA"
* commit 'e2be065142dc22f1eea033334f6ba4cf16559e56':
Do not set the network mode differently for LTE+CDMA
Diffstat (limited to 'packages')
| -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 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 @@ 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 |