diff options
author | Etan Cohen <etancohen@google.com> | 2014-10-09 19:29:43 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-09 19:29:43 +0000 |
commit | 4354e6046e4a35b2f35348c6c131fdd600ac26af (patch) | |
tree | 44a349ad4fbc51d962566a84333677b9e312b83b /telephony | |
parent | 4a718f2af33159e58f4ad639d9d0e633a6ca8a8f (diff) | |
parent | 5e5bc4b13cd1fc657da940c14e2333d8d3b18080 (diff) | |
download | frameworks_base-4354e6046e4a35b2f35348c6c131fdd600ac26af.zip frameworks_base-4354e6046e4a35b2f35348c6c131fdd600ac26af.tar.gz frameworks_base-4354e6046e4a35b2f35348c6c131fdd600ac26af.tar.bz2 |
am 5e5bc4b1: TD_SCDMA is more like GSM than CDMA - re-classifying.
* commit '5e5bc4b13cd1fc657da940c14e2333d8d3b18080':
TD_SCDMA is more like GSM than CDMA - re-classifying.
Diffstat (limited to 'telephony')
-rw-r--r-- | telephony/java/android/telephony/ServiceState.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java index 8e43772..52d0516 100644 --- a/telephony/java/android/telephony/ServiceState.java +++ b/telephony/java/android/telephony/ServiceState.java @@ -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,7 +862,6 @@ 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; } } |