am 4354e604: am 5e5bc4b1: TD_SCDMA is more like GSM than CDMA - re-classifying.

* commit '4354e6046e4a35b2f35348c6c131fdd600ac26af':
  TD_SCDMA is more like GSM than CDMA - re-classifying.
This commit is contained in:
Etan Cohen
2014-10-10 00:30:14 +00:00
committed by Android Git Automerger

View File

@@ -850,7 +850,8 @@ public class ServiceState implements Parcelable {
|| radioTechnology == RIL_RADIO_TECHNOLOGY_HSPA
|| radioTechnology == RIL_RADIO_TECHNOLOGY_LTE
|| radioTechnology == RIL_RADIO_TECHNOLOGY_HSPAP
|| radioTechnology == RIL_RADIO_TECHNOLOGY_GSM;
|| radioTechnology == RIL_RADIO_TECHNOLOGY_GSM
|| radioTechnology == RIL_RADIO_TECHNOLOGY_TD_SCDMA;
}
/** @hide */
@@ -861,8 +862,7 @@ 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_TD_SCDMA;
|| radioTechnology == RIL_RADIO_TECHNOLOGY_EHRPD;
}
/**