Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not set the network mode differently for LTE+CDMA"

Browse Source
This commit is contained in:
Wink Saville
2013-07-01 22:56:08 +00:00
committed by Gerrit Code Review
parent e3b94f05b8 97ecc9ec24
commit aff0ac4d20
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
View File

@@ -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