diff options
| author | Wink Saville <wink@google.com> | 2011-06-09 11:55:30 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-09 11:55:30 -0700 |
| commit | 023180409516b463b7358ec42bd3a810b2e225c3 (patch) | |
| tree | 1f52e8a165f0a5de4c226704b94c153a823b9aee /packages/SettingsProvider/src | |
| parent | 1634542fa084ead13f433a0cfc77bf15fe0e68cf (diff) | |
| parent | 0da86d4fef70f94a02a504f8500df2833719da6b (diff) | |
| download | frameworks_base-023180409516b463b7358ec42bd3a810b2e225c3.zip frameworks_base-023180409516b463b7358ec42bd3a810b2e225c3.tar.gz frameworks_base-023180409516b463b7358ec42bd3a810b2e225c3.tar.bz2 | |
am 0da86d4f: am a558fdf1: Merge "Fix default preferred network." into honeycomb-LTE
* commit '0da86d4fef70f94a02a504f8500df2833719da6b':
Fix default preferred network.
Diffstat (limited to 'packages/SettingsProvider/src')
| -rw-r--r-- | packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java index 0f5f095..9cbf704 100644 --- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java +++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java @@ -17,6 +17,8 @@ package com.android.providers.settings; import com.android.internal.content.PackageHelper; +import com.android.internal.telephony.BaseCommands; +import com.android.internal.telephony.Phone; import com.android.internal.telephony.RILConstants; import com.android.internal.util.XmlUtils; import com.android.internal.widget.LockPatternUtils; @@ -1300,8 +1302,13 @@ public class DatabaseHelper extends SQLiteOpenHelper { } // Set the preferred network mode to 0 = Global, CDMA default - int type = SystemProperties.getInt("ro.telephony.default_network", - RILConstants.PREFERRED_NETWORK_MODE); + int type; + if (BaseCommands.getLteOnCdmaModeStatic() == Phone.LTE_ON_CDMA_TRUE) { + type = Phone.NT_MODE_GLOBAL; + } else { + type = SystemProperties.getInt("ro.telephony.default_network", + RILConstants.PREFERRED_NETWORK_MODE); + } loadSetting(stmt, Settings.Secure.PREFERRED_NETWORK_MODE, type); // Enable or disable Cell Broadcast SMS |