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

* commit '81e3e4724d2c506bf9e920fd253c54a0bbd38706':
  Add TD_SCDMA RAT type (already exists in RIL) and classify as CDMA.
This commit is contained in:
Etan Cohen
2014-10-02 21:42:15 +00:00
committed by Android Git Automerger

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,6 +861,7 @@ 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;
} }
} }