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

Merge "Add support for NETWORK_TYPE_GSM"

Browse Source
This commit is contained in:
Wink Saville
2014-05-01 17:53:54 +00:00
committed by Gerrit Code Review
parent ab3977d211 10731a6140
commit 7e411f74ef
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; return TelephonyManager.NETWORK_TYPE_LTE;
case ServiceState.RIL_RADIO_TECHNOLOGY_HSPAP: case ServiceState.RIL_RADIO_TECHNOLOGY_HSPAP:
return TelephonyManager.NETWORK_TYPE_HSPAP; return TelephonyManager.NETWORK_TYPE_HSPAP;
case ServiceState.RIL_RADIO_TECHNOLOGY_GSM:
return TelephonyManager.NETWORK_TYPE_GSM;
default: default:
return TelephonyManager.NETWORK_TYPE_UNKNOWN; return TelephonyManager.NETWORK_TYPE_UNKNOWN;
} }

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

@@ -872,6 +872,8 @@ public class TelephonyManager {
public static final int NETWORK_TYPE_EHRPD = 14; public static final int NETWORK_TYPE_EHRPD = 14;
/** Current network is HSPA+ */ /** Current network is HSPA+ */
public static final int NETWORK_TYPE_HSPAP = 15; 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. * @return the NETWORK_TYPE_xxxx for current data connection.
@@ -963,6 +965,7 @@ public class TelephonyManager {
public static int getNetworkClass(int networkType) { public static int getNetworkClass(int networkType) {
switch (networkType) { switch (networkType) {
case NETWORK_TYPE_GPRS: case NETWORK_TYPE_GPRS:
case NETWORK_TYPE_GSM:
case NETWORK_TYPE_EDGE: case NETWORK_TYPE_EDGE:
case NETWORK_TYPE_CDMA: case NETWORK_TYPE_CDMA:
case NETWORK_TYPE_1xRTT: case NETWORK_TYPE_1xRTT:
@@ -1029,6 +1032,8 @@ public class TelephonyManager {
return "iDEN"; return "iDEN";
case NETWORK_TYPE_HSPAP: case NETWORK_TYPE_HSPAP:
return "HSPA+"; return "HSPA+";
case NETWORK_TYPE_GSM:
return "GSM";
default: default:
return "UNKNOWN"; return "UNKNOWN";
} }