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

Update mapping between RAF and Network Type.

Browse Source 
bug:18754476
Change-Id: I5bdb8df192610b831a418ae810fe4f3b96c30f77
This commit is contained in:
Wink Saville
2014-12-17 14:38:49 -08:00
parent 63c79ce4bf
commit f73c2d1f0b
1 changed files with 36 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -136,38 +136,57 @@ public class RadioAccessFamily implements Parcelable {
}; };
public static int getRafFromNetworkType(int type) { public static int getRafFromNetworkType(int type) {
final int GSM = RAF_GSM | RAF_GPRS | RAF_EDGE;
final int HS = RAF_HSUPA | RAF_HSDPA | RAF_HSPA | RAF_HSPAP;
final int CDMA = RAF_IS95A | RAF_IS95B | RAF_1xRTT;
final int EVDO = RAF_EVDO_0 | RAF_EVDO_A | RAF_EVDO_B;
final int WCDMA = HS | RAF_UMTS;
int raf;
switch (type) { switch (type) {
case RILConstants.NETWORK_MODE_WCDMA_PREF: case RILConstants.NETWORK_MODE_WCDMA_PREF:
return RAF_GSM | RAF_UMTS | RAF_HSUPA | RAF_HSDPA | RAF_HSPA | RAF_HSPAP; raf = GSM | WCDMA;
break;
case RILConstants.NETWORK_MODE_GSM_ONLY: case RILConstants.NETWORK_MODE_GSM_ONLY:
return RAF_GSM; raf = GSM;
break;
case RILConstants.NETWORK_MODE_WCDMA_ONLY: case RILConstants.NETWORK_MODE_WCDMA_ONLY:
return RAF_UMTS | RAF_HSUPA | RAF_HSDPA | RAF_HSPA | RAF_HSPAP; raf = WCDMA;
break;
case RILConstants.NETWORK_MODE_GSM_UMTS: case RILConstants.NETWORK_MODE_GSM_UMTS:
return RAF_GSM | RAF_UMTS | RAF_HSUPA | RAF_HSDPA | RAF_HSPA | RAF_HSPAP; raf = GSM | WCDMA;
break;
case RILConstants.NETWORK_MODE_CDMA: case RILConstants.NETWORK_MODE_CDMA:
return RAF_EVDO_0 | RAF_EVDO_A | RAF_EVDO_B | RAF_IS95A | RAF_IS95B | RAF_1xRTT; raf = CDMA;
break;
case RILConstants.NETWORK_MODE_LTE_CDMA_EVDO: case RILConstants.NETWORK_MODE_LTE_CDMA_EVDO:
return RAF_EVDO_0 | RAF_EVDO_A | RAF_EVDO_B | RAF_IS95A | RAF_IS95B | RAF_1xRTT raf = RAF_LTE | CDMA | EVDO;
| RAF_EHRPD; break;
case RILConstants.NETWORK_MODE_LTE_GSM_WCDMA: case RILConstants.NETWORK_MODE_LTE_GSM_WCDMA:
return RAF_GSM | RAF_UMTS | RAF_LTE | RAF_HSUPA | RAF_HSDPA | RAF_HSPA | RAF_HSPAP; raf = RAF_LTE | GSM | WCDMA;
break;
case RILConstants.NETWORK_MODE_LTE_CDMA_EVDO_GSM_WCDMA: 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 = RAF_LTE | CDMA | EVDO | GSM | WCDMA;
| RAF_IS95A | RAF_IS95B | RAF_1xRTT | RAF_EHRPD | RAF_HSUPA | RAF_HSDPA break;
| RAF_HSPA | RAF_HSPAP;
case RILConstants.NETWORK_MODE_LTE_ONLY: case RILConstants.NETWORK_MODE_LTE_ONLY:
return RAF_LTE; raf = RAF_LTE;
break;
case RILConstants.NETWORK_MODE_LTE_WCDMA: case RILConstants.NETWORK_MODE_LTE_WCDMA:
return RAF_LTE | RAF_UMTS | RAF_HSUPA | RAF_HSDPA | RAF_HSPA | RAF_HSPAP; raf = RAF_LTE | WCDMA;
break;
case RILConstants.NETWORK_MODE_CDMA_NO_EVDO: case RILConstants.NETWORK_MODE_CDMA_NO_EVDO:
return RAF_UNKNOWN; raf = CDMA;
break;
case RILConstants.NETWORK_MODE_EVDO_NO_CDMA: case RILConstants.NETWORK_MODE_EVDO_NO_CDMA:
return RAF_UNKNOWN; raf = EVDO;
break;
case RILConstants.NETWORK_MODE_GLOBAL: case RILConstants.NETWORK_MODE_GLOBAL:
return RAF_UNKNOWN; raf = GSM | WCDMA | CDMA | EVDO;
break;
default: default:
return RAF_UNKNOWN; raf = RAF_UNKNOWN;
break;
} }
} }
} }