am 881d5387: Merge "frameworks/base: Support for LTE network modes"

* commit '881d5387a3e92fa30f5966f00a04c4a33af8f18b':
  frameworks/base: Support for LTE network modes
This commit is contained in:
Wink Saville
2013-01-03 15:14:15 -08:00
committed by Android Git Automerger
2 changed files with 3 additions and 1 deletions

View File

@@ -377,6 +377,8 @@ public class TelephonyManager {
case RILConstants.NETWORK_MODE_GSM_ONLY:
case RILConstants.NETWORK_MODE_WCDMA_ONLY:
case RILConstants.NETWORK_MODE_GSM_UMTS:
case RILConstants.NETWORK_MODE_LTE_GSM_WCDMA:
case RILConstants.NETWORK_MODE_LTE_WCDMA:
return PhoneConstants.PHONE_TYPE_GSM;
// Use CDMA Phone for the global mode including CDMA

View File

@@ -72,7 +72,7 @@ public interface RILConstants {
int NETWORK_MODE_LTE_GSM_WCDMA = 9; /* LTE, GSM/WCDMA */
int NETWORK_MODE_LTE_CMDA_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 CDMA_CELL_BROADCAST_SMS_DISABLED = 1;