diff options
| author | 2014-12-19 18:11:59 +0000 | |
|---|---|---|
| committer | 2014-12-19 18:11:59 +0000 | |
| commit | 1bb25d4d7b77ba8fe91beeed76e4f15e91b6bcc8 (patch) | |
| tree | d1f86d2a2d864c27ca0005f9a8f53b76c69ca58b | |
| parent | ddac2a7b3157efaf3d1afcd2c3e3cc5699e7585f (diff) | |
| parent | 7b727e2e0aedef50aba8e3d4081a643b79329497 (diff) | |
am aa40537c: am 63c79ce4: Merge "Update mapping between RAF and Network Type." into lmp-mr1-dev
automerge: 7b727e2
* commit '7b727e2e0aedef50aba8e3d4081a643b79329497':
Update mapping between RAF and Network Type.
| -rw-r--r-- | telephony/java/android/telephony/RadioAccessFamily.java | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/telephony/java/android/telephony/RadioAccessFamily.java b/telephony/java/android/telephony/RadioAccessFamily.java index 734fc68511d1..0820bfa50097 100644 --- a/telephony/java/android/telephony/RadioAccessFamily.java +++ b/telephony/java/android/telephony/RadioAccessFamily.java @@ -136,13 +136,36 @@ public class RadioAccessFamily implements Parcelable { }; public static int getRafFromNetworkType(int type) { - // TODO map from RILConstants.NETWORK_TYPE_* to RAF_* switch (type) { case RILConstants.NETWORK_MODE_WCDMA_PREF: - case RILConstants.NETWORK_MODE_GSM_UMTS: - return RAF_UMTS | RAF_GSM; + return RAF_GSM | RAF_UMTS | RAF_HSUPA | RAF_HSDPA | RAF_HSPA | RAF_HSPAP; case RILConstants.NETWORK_MODE_GSM_ONLY: return RAF_GSM; + case RILConstants.NETWORK_MODE_WCDMA_ONLY: + return RAF_UMTS | RAF_HSUPA | RAF_HSDPA | RAF_HSPA | RAF_HSPAP; + case RILConstants.NETWORK_MODE_GSM_UMTS: + return RAF_GSM | RAF_UMTS | RAF_HSUPA | RAF_HSDPA | RAF_HSPA | RAF_HSPAP; + case RILConstants.NETWORK_MODE_CDMA: + return RAF_EVDO_0 | RAF_EVDO_A | RAF_EVDO_B | RAF_IS95A | RAF_IS95B | RAF_1xRTT; + case RILConstants.NETWORK_MODE_LTE_CDMA_EVDO: + return RAF_EVDO_0 | RAF_EVDO_A | RAF_EVDO_B | RAF_IS95A | RAF_IS95B | RAF_1xRTT + | RAF_EHRPD; + case RILConstants.NETWORK_MODE_LTE_GSM_WCDMA: + return RAF_GSM | RAF_UMTS | RAF_LTE | RAF_HSUPA | RAF_HSDPA | RAF_HSPA | RAF_HSPAP; + case RILConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA: + return RAF_GSM | RAF_UMTS | RAF_LTE | RAF_EVDO_0 | RAF_EVDO_A | RAF_EVDO_B + | RAF_IS95A | RAF_IS95B | RAF_1xRTT | RAF_EHRPD | RAF_HSUPA | RAF_HSDPA + | RAF_HSPA | RAF_HSPAP; + case RILConstants.NETWORK_MODE_LTE_ONLY: + return RAF_LTE; + case RILConstants.NETWORK_MODE_LTE_WCDMA: + return RAF_LTE | RAF_UMTS | RAF_HSUPA | RAF_HSDPA | RAF_HSPA | RAF_HSPAP; + case RILConstants.NETWORK_MODE_CDMA_NO_EVDO: + return RAF_UNKNOWN; + case RILConstants.NETWORK_MODE_EVDO_NO_CDMA: + return RAF_UNKNOWN; + case RILConstants.NETWORK_MODE_GLOBAL: + return RAF_UNKNOWN; default: return RAF_UNKNOWN; } |