diff options
Diffstat (limited to 'telephony/java/android/telephony/RadioAccessFamily.java')
| -rwxr-xr-x | telephony/java/android/telephony/RadioAccessFamily.java | 64 |
1 files changed, 32 insertions, 32 deletions
diff --git a/telephony/java/android/telephony/RadioAccessFamily.java b/telephony/java/android/telephony/RadioAccessFamily.java index c079eae..2906a2d 100755 --- a/telephony/java/android/telephony/RadioAccessFamily.java +++ b/telephony/java/android/telephony/RadioAccessFamily.java @@ -187,35 +187,35 @@ public class RadioAccessFamily implements Parcelable { case RILConstants.NETWORK_MODE_GLOBAL: raf = GSM | WCDMA | CDMA | EVDO; break; - case RILConstants.NETWORK_MODE_TD_SCDMA_ONLY: + case RILConstants.NETWORK_MODE_TDSCDMA_ONLY: raf = RAF_TD_SCDMA; break; - case RILConstants.NETWORK_MODE_TD_SCDMA_WCDMA: + case RILConstants.NETWORK_MODE_TDSCDMA_WCDMA: raf = RAF_TD_SCDMA | WCDMA; break; - case RILConstants.NETWORK_MODE_TD_SCDMA_LTE: - raf = RAF_TD_SCDMA | LTE; + case RILConstants.NETWORK_MODE_LTE_TDSCDMA: + raf = RAF_LTE | RAF_TD_SCDMA; break; - case RILConstants.NETWORK_MODE_TD_SCDMA_GSM: + case RILConstants.NETWORK_MODE_TDSCDMA_GSM: raf = RAF_TD_SCDMA | GSM; break; - case RILConstants.NETWORK_MODE_TD_SCDMA_GSM_LTE: - raf = RAF_TD_SCDMA | GSM | LTE; + case RILConstants.NETWORK_MODE_LTE_TDSCDMA_GSM: + raf = RAF_LTE | RAF_TD_SCDMA | GSM; break; - case RILConstants.NETWORK_MODE_TD_SCDMA_GSM_WCDMA: + case RILConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA: raf = RAF_TD_SCDMA | GSM | WCDMA; break; - case RILConstants.NETWORK_MODE_TD_SCDMA_WCDMA_LTE: - raf = RAF_TD_SCDMA | WCDMA | LTE; + case RILConstants.NETWORK_MODE_LTE_TDSCDMA_WCDMA: + raf = RAF_LTE | RAF_TD_SCDMA | WCDMA; break; - case RILConstants.NETWORK_MODE_TD_SCDMA_GSM_WCDMA_LTE: - raf = RAF_TD_SCDMA | GSM | WCDMA | LTE; + case RILConstants.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA: + raf = RAF_LTE | RAF_TD_SCDMA | GSM | WCDMA; break; - case RILConstants.NETWORK_MODE_TD_SCDMA_GSM_WCDMA_CDMA_EVDO: - raf = RAF_TD_SCDMA | GSM | WCDMA | CDMA | EVDO; + case RILConstants.NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA: + raf = RAF_TD_SCDMA | CDMA | EVDO | GSM | WCDMA; break; - case RILConstants.NETWORK_MODE_TD_SCDMA_LTE_CDMA_EVDO_GSM_WCDMA: - raf = RAF_TD_SCDMA | LTE | CDMA | EVDO | GSM | WCDMA; + case RILConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA: + raf = RAF_LTE | RAF_TD_SCDMA | CDMA | EVDO | GSM | WCDMA; break; default: raf = RAF_UNKNOWN; @@ -282,34 +282,34 @@ public class RadioAccessFamily implements Parcelable { type = RILConstants.NETWORK_MODE_GLOBAL; break; case RAF_TD_SCDMA: - type = RILConstants.NETWORK_MODE_TD_SCDMA_ONLY; + type = RILConstants.NETWORK_MODE_TDSCDMA_ONLY; break; case (RAF_TD_SCDMA | WCDMA): - type = RILConstants.NETWORK_MODE_TD_SCDMA_WCDMA; + type = RILConstants.NETWORK_MODE_TDSCDMA_WCDMA; break; - case (RAF_TD_SCDMA | LTE): - type = RILConstants.NETWORK_MODE_TD_SCDMA_LTE; + case (RAF_LTE | RAF_TD_SCDMA): + type = RILConstants.NETWORK_MODE_LTE_TDSCDMA; break; case (RAF_TD_SCDMA | GSM): - type = RILConstants.NETWORK_MODE_TD_SCDMA_GSM; + type = RILConstants.NETWORK_MODE_TDSCDMA_GSM; break; - case (RAF_TD_SCDMA | GSM | LTE): - type = RILConstants.NETWORK_MODE_TD_SCDMA_GSM_LTE; + case (RAF_LTE | RAF_TD_SCDMA | GSM): + type = RILConstants.NETWORK_MODE_LTE_TDSCDMA_GSM; break; case (RAF_TD_SCDMA | GSM | WCDMA): - type = RILConstants.NETWORK_MODE_TD_SCDMA_GSM_WCDMA; + type = RILConstants.NETWORK_MODE_TDSCDMA_GSM_WCDMA; break; - case (RAF_TD_SCDMA | WCDMA | LTE): - type = RILConstants.NETWORK_MODE_TD_SCDMA_WCDMA_LTE; + case (RAF_LTE | RAF_TD_SCDMA | WCDMA): + type = RILConstants.NETWORK_MODE_LTE_TDSCDMA_WCDMA; break; - case (RAF_TD_SCDMA | GSM | WCDMA | LTE): - type = RILConstants.NETWORK_MODE_TD_SCDMA_GSM_WCDMA_LTE; + case (RAF_LTE | RAF_TD_SCDMA | GSM | WCDMA): + type = RILConstants.NETWORK_MODE_LTE_TDSCDMA_GSM_WCDMA; break; - case (RAF_TD_SCDMA| GSM | WCDMA | CDMA | EVDO): - type = RILConstants.NETWORK_MODE_TD_SCDMA_GSM_WCDMA_CDMA_EVDO; + case (RAF_TD_SCDMA | CDMA | EVDO | GSM | WCDMA): + type = RILConstants.NETWORK_MODE_TDSCDMA_CDMA_EVDO_GSM_WCDMA; break; - case (RAF_TD_SCDMA| LTE | CDMA | EVDO | GSM | WCDMA): - type = RILConstants.NETWORK_MODE_TD_SCDMA_LTE_CDMA_EVDO_GSM_WCDMA; + case (RAF_LTE | RAF_TD_SCDMA | RAF_LTE | CDMA | EVDO | GSM | WCDMA): + type = RILConstants.NETWORK_MODE_LTE_TDSCDMA_CDMA_EVDO_GSM_WCDMA; break; default: type = RILConstants.PREFERRED_NETWORK_MODE ; |