diff options
author | Etan Cohen <etancohen@google.com> | 2014-10-02 21:48:20 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-02 21:48:20 +0000 |
commit | 53fbb02d6d15be0e0466ad713b6bca6dd2f2dd08 (patch) | |
tree | bf1668006804e4276915c3a077f6b90759a451af /telephony/java/android/telephony/ServiceState.java | |
parent | 1f192b6d5f7c932cac22c4f8f9b612572fccec39 (diff) | |
parent | b3a29067e956c05fd9f01bb31ae4101b43b95948 (diff) | |
download | frameworks_base-53fbb02d6d15be0e0466ad713b6bca6dd2f2dd08.zip frameworks_base-53fbb02d6d15be0e0466ad713b6bca6dd2f2dd08.tar.gz frameworks_base-53fbb02d6d15be0e0466ad713b6bca6dd2f2dd08.tar.bz2 |
am b3a29067: am 81e3e472: Merge "Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA." into lmp-dev
* commit 'b3a29067e956c05fd9f01bb31ae4101b43b95948':
Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA.
Diffstat (limited to 'telephony/java/android/telephony/ServiceState.java')
-rw-r--r-- | telephony/java/android/telephony/ServiceState.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java index ce89538..8f2ec79 100644 --- a/telephony/java/android/telephony/ServiceState.java +++ b/telephony/java/android/telephony/ServiceState.java @@ -146,6 +146,8 @@ public class ServiceState implements Parcelable { * @hide */ public static final int RIL_RADIO_TECHNOLOGY_GSM = 16; + /** @hide */ + public static final int RIL_RADIO_TECHNOLOGY_TD_SCDMA = 17; /** * Available registration states for GSM, UMTS and CDMA. @@ -859,7 +861,8 @@ public class ServiceState implements Parcelable { || radioTechnology == RIL_RADIO_TECHNOLOGY_EVDO_0 || radioTechnology == RIL_RADIO_TECHNOLOGY_EVDO_A || radioTechnology == RIL_RADIO_TECHNOLOGY_EVDO_B - || radioTechnology == RIL_RADIO_TECHNOLOGY_EHRPD; + || radioTechnology == RIL_RADIO_TECHNOLOGY_EHRPD + || radioTechnology == RIL_RADIO_TECHNOLOGY_TD_SCDMA; } /** |