summaryrefslogtreecommitdiffstats
path: root/telephony
diff options
context:
space:
mode:
authorAmit Mahajan <amitmahajan@google.com>2014-11-19 17:57:39 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-11-19 17:57:39 +0000
commitbb35bbf198201fc00858ea56cdf97eae8f2cfdbb (patch)
treec38b4c10c68843c479430098171a4e35e59a0a9c /telephony
parent34a2ee695d7411c6b9abd7db3fd105851092bafb (diff)
parent6f10d1c34efba28856fea162f1d193319cad2576 (diff)
downloadframeworks_base-bb35bbf198201fc00858ea56cdf97eae8f2cfdbb.zip
frameworks_base-bb35bbf198201fc00858ea56cdf97eae8f2cfdbb.tar.gz
frameworks_base-bb35bbf198201fc00858ea56cdf97eae8f2cfdbb.tar.bz2
am 6f10d1c3: am b22462c5: Merge "Adding new setting LTE_SERVICE_FORCED." into lmp-mr1-dev
* commit '6f10d1c34efba28856fea162f1d193319cad2576': Adding new setting LTE_SERVICE_FORCED.
Diffstat (limited to 'telephony')
-rw-r--r--telephony/java/com/android/internal/telephony/RILConstants.java5
1 files changed, 4 insertions, 1 deletions
diff --git a/telephony/java/com/android/internal/telephony/RILConstants.java b/telephony/java/com/android/internal/telephony/RILConstants.java
index a6d6daa..082e8bb 100644
--- a/telephony/java/com/android/internal/telephony/RILConstants.java
+++ b/telephony/java/com/android/internal/telephony/RILConstants.java
@@ -24,6 +24,8 @@ package com.android.internal.telephony;
* Also they should all probably be static final.
*/
+import android.os.SystemProperties;
+
/**
* {@hide}
*/
@@ -86,7 +88,8 @@ public interface RILConstants {
int NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA = 10; /* LTE, CDMA, EvDo, GSM/WCDMA */
int NETWORK_MODE_LTE_ONLY = 11; /* LTE Only mode. */
int NETWORK_MODE_LTE_WCDMA = 12; /* LTE/WCDMA */
- int PREFERRED_NETWORK_MODE = NETWORK_MODE_WCDMA_PREF;
+ int PREFERRED_NETWORK_MODE = SystemProperties.getInt("ro.telephony.default_network",
+ NETWORK_MODE_WCDMA_PREF);
int CDMA_CELL_BROADCAST_SMS_DISABLED = 1;
int CDMA_CELL_BROADCAST_SMS_ENABLED = 0;