diff options
| author | Wink Saville <wink@google.com> | 2013-01-03 15:21:52 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-01-03 15:21:52 -0800 |
| commit | c48233c60d8fdb93b62c19a7f77cb56242fe1f65 (patch) | |
| tree | 448433fc00e2a2c541c37eeb1fe0b4a27b699177 /telephony | |
| parent | 5913148104f0b233d861fab2873befc865bf57c0 (diff) | |
| parent | c6e41cf2680773b02a7d8caacb6047ed31d6c260 (diff) | |
| download | frameworks_base-c48233c60d8fdb93b62c19a7f77cb56242fe1f65.zip frameworks_base-c48233c60d8fdb93b62c19a7f77cb56242fe1f65.tar.gz frameworks_base-c48233c60d8fdb93b62c19a7f77cb56242fe1f65.tar.bz2 | |
am c6e41cf2: am 28a7a059: am 881d5387: Merge "frameworks/base: Support for LTE network modes"
* commit 'c6e41cf2680773b02a7d8caacb6047ed31d6c260':
frameworks/base: Support for LTE network modes
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 2 | ||||
| -rw-r--r-- | telephony/java/com/android/internal/telephony/RILConstants.java | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 2e8de3b..6241a49 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -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 diff --git a/telephony/java/com/android/internal/telephony/RILConstants.java b/telephony/java/com/android/internal/telephony/RILConstants.java index f501b21..077ad68 100644 --- a/telephony/java/com/android/internal/telephony/RILConstants.java +++ b/telephony/java/com/android/internal/telephony/RILConstants.java @@ -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; |