am 6f10d1c3: am b22462c5: Merge "Adding new setting LTE_SERVICE_FORCED." into lmp-mr1-dev

* commit '6f10d1c34efba28856fea162f1d193319cad2576':
  Adding new setting LTE_SERVICE_FORCED.
This commit is contained in:
Amit Mahajan
2014-11-19 17:57:39 +00:00
committed by Android Git Automerger
3 changed files with 14 additions and 3 deletions

View File

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