commit 5fef96c5a6c8aa6e4bac9d4266863bb1f4baeb00
author Etan Cohen <etancohen@google.com> Fri Oct 10 22:06:38 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 10 22:06:38 2014 +0000
tree 0181630438aecc9192d05f599e4631fdce6f346a
parent 6151222e3106c40e8d67a15762def1ecb37618e7
parent eaecf6a2c98169534dc8d4bd98099b3731b67b1d

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

* commit 'eaecf6a2c98169534dc8d4bd98099b3731b67b1d':
  TD_SCDMA is more like GSM than CDMA - re-classifying.

telephony/java/android/telephony/ServiceState.java

diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java
index 8f2ec79..8c2a4eb 100644
--- a/telephony/java/android/telephony/ServiceState.java
+++ b/telephony/java/android/telephony/ServiceState.java
@@ -850,7 +850,8 @@
                 || 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 @@
                 || 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;
     }
 
     /**