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

am 192384bb: am 43799457: am 74ec5808: am 7e411f74: Merge "Add support for NETWORK_TYPE_GSM"

Browse Source 
* commit '192384bb2708c49ca6c91432b8c848f43557429a':
  Add support for NETWORK_TYPE_GSM
This commit is contained in:
Wink Saville
2014-05-01 18:07:58 +00:00
committed by Android Git Automerger
parent ce3bdb8417 51d427ca9b
commit 784f90facf
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
telephony/java/android/telephony/ServiceState.java
View File

@@ -797,6 +797,8 @@ public class ServiceState implements Parcelable {
return TelephonyManager.NETWORK_TYPE_LTE;
case ServiceState.RIL_RADIO_TECHNOLOGY_HSPAP:
return TelephonyManager.NETWORK_TYPE_HSPAP;
case ServiceState.RIL_RADIO_TECHNOLOGY_GSM:
return TelephonyManager.NETWORK_TYPE_GSM;
default:
return TelephonyManager.NETWORK_TYPE_UNKNOWN;
}

5
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -926,6 +926,8 @@ public class TelephonyManager {
public static final int NETWORK_TYPE_EHRPD = 14;
/** Current network is HSPA+ */
public static final int NETWORK_TYPE_HSPAP = 15;
/** Current network is GSM {@hide} */
public static final int NETWORK_TYPE_GSM = 16;
/**
* @return the NETWORK_TYPE_xxxx for current data connection.
@@ -1017,6 +1019,7 @@ public class TelephonyManager {
public static int getNetworkClass(int networkType) {
switch (networkType) {
case NETWORK_TYPE_GPRS:
case NETWORK_TYPE_GSM:
case NETWORK_TYPE_EDGE:
case NETWORK_TYPE_CDMA:
case NETWORK_TYPE_1xRTT:
@@ -1083,6 +1086,8 @@ public class TelephonyManager {
return "iDEN";
case NETWORK_TYPE_HSPAP:
return "HSPA+";
case NETWORK_TYPE_GSM:
return "GSM";
default:
return "UNKNOWN";
}