Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3b73c5c3: am 53fbb02d: am b3a29067: am 81e3e472: Merge "Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA." into lmp-dev

Browse Source 
* commit '3b73c5c3cfc9754358ba1f4c49582d303fd04d8a':
  Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA.
This commit is contained in:
Etan Cohen
2014-10-02 22:01:39 +00:00
committed by Android Git Automerger
parent 2e6e7e2ca2 3b73c5c3cf
commit fe98046494
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
telephony/java/android/telephony/ServiceState.java
View File

@@ -146,6 +146,8 @@ public class ServiceState implements Parcelable {
* @hide * @hide
*/ */
public static final int RIL_RADIO_TECHNOLOGY_GSM = 16; 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. * 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_0
|| radioTechnology == RIL_RADIO_TECHNOLOGY_EVDO_A || radioTechnology == RIL_RADIO_TECHNOLOGY_EVDO_A
|| radioTechnology == RIL_RADIO_TECHNOLOGY_EVDO_B || radioTechnology == RIL_RADIO_TECHNOLOGY_EVDO_B
|| radioTechnology == RIL_RADIO_TECHNOLOGY_EHRPD; || radioTechnology == RIL_RADIO_TECHNOLOGY_EHRPD
|| radioTechnology == RIL_RADIO_TECHNOLOGY_TD_SCDMA;
} }
/** /**