summaryrefslogtreecommitdiffstats
path: root/packages/SettingsProvider
diff options
context:
space:
mode:
authorAmit Mahajan <amitmahajan@google.com>2014-11-19 18:05:33 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-19 18:05:33 +0000
commit5ed01f6427d9dccaa95bac8c02bd88b83897652b (patch)
tree6f70e8d2a39bdadad6094dd93109691942eee288 /packages/SettingsProvider
parentee33301aaeeb9adb540f943e091bd35f3721324d (diff)
parentbb35bbf198201fc00858ea56cdf97eae8f2cfdbb (diff)
downloadframeworks_base-5ed01f6427d9dccaa95bac8c02bd88b83897652b.zip
frameworks_base-5ed01f6427d9dccaa95bac8c02bd88b83897652b.tar.gz
frameworks_base-5ed01f6427d9dccaa95bac8c02bd88b83897652b.tar.bz2
am bb35bbf1: am 6f10d1c3: am b22462c5: Merge "Adding new setting LTE_SERVICE_FORCED." into lmp-mr1-dev
* commit 'bb35bbf198201fc00858ea56cdf97eae8f2cfdbb': Adding new setting LTE_SERVICE_FORCED.
Diffstat (limited to 'packages/SettingsProvider')
-rw-r--r--packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java3
1 files changed, 1 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 1771eac..175b424 100644
--- a/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
+++ b/packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java
@@ -2620,8 +2620,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
// Set the preferred network mode to target desired value or Default
// value defined in RILConstants
int type;
- type = SystemProperties.getInt("ro.telephony.default_network",
- RILConstants.PREFERRED_NETWORK_MODE);
+ type = RILConstants.PREFERRED_NETWORK_MODE;
loadSetting(stmt, Settings.Global.PREFERRED_NETWORK_MODE, type);
// Set the preferred cdma subscription source to target desired value or default