diff options
| author | Wink Saville <wink@google.com> | 2014-05-01 18:07:58 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-01 18:07:58 +0000 |
| commit | 784f90facfe32263a295fe512e20a10d1d8a250a (patch) | |
| tree | 111dc6efe2c1420a902e4b2034487882d7ce29a3 /telephony | |
| parent | ce3bdb841717400b059d29c37a27648ac15c04d5 (diff) | |
| parent | 51d427ca9bca22d709f2940fb949cb38892c28a7 (diff) | |
| download | frameworks_base-784f90facfe32263a295fe512e20a10d1d8a250a.zip frameworks_base-784f90facfe32263a295fe512e20a10d1d8a250a.tar.gz frameworks_base-784f90facfe32263a295fe512e20a10d1d8a250a.tar.bz2 | |
am 192384bb: am 43799457: am 74ec5808: am 7e411f74: Merge "Add support for NETWORK_TYPE_GSM"
* commit '192384bb2708c49ca6c91432b8c848f43557429a':
Add support for NETWORK_TYPE_GSM
Diffstat (limited to 'telephony')
| -rw-r--r-- | telephony/java/android/telephony/ServiceState.java | 2 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 5 |
2 files changed, 7 insertions, 0 deletions
diff --git a/telephony/java/android/telephony/ServiceState.java b/telephony/java/android/telephony/ServiceState.java index 606fcb4..1ee390f 100644 --- a/telephony/java/android/telephony/ServiceState.java +++ b/telephony/java/android/telephony/ServiceState.java @@ -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; } diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index c21319c..cbd3ff8 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -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"; } |