Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update mapping between RAF and Network Type." into lmp-mr1-dev

Browse Source
This commit is contained in:
Wink Saville
2014-12-19 17:58:50 +00:00
committed by Android (Google) Code Review
parent 8d24fe235a 482b4246c2
commit 63c79ce4bf
1 changed files with 26 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
telephony/java/android/telephony/RadioAccessFamily.java
View File

@@ -136,13 +136,36 @@ public class RadioAccessFamily implements Parcelable {
}; };
public static int getRafFromNetworkType(int type) { public static int getRafFromNetworkType(int type) {
// TODO map from RILConstants.NETWORK_TYPE_* to RAF_*
switch (type) { switch (type) {
case RILConstants.NETWORK_MODE_WCDMA_PREF: case RILConstants.NETWORK_MODE_WCDMA_PREF:
case RILConstants.NETWORK_MODE_GSM_UMTS: return RAF_GSM | RAF_UMTS | RAF_HSUPA | RAF_HSDPA | RAF_HSPA | RAF_HSPAP;
return RAF_UMTS | RAF_GSM;
case RILConstants.NETWORK_MODE_GSM_ONLY: case RILConstants.NETWORK_MODE_GSM_ONLY:
return RAF_GSM; 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: default:
return RAF_UNKNOWN; return RAF_UNKNOWN;
} }