diff options
| author | Wink Saville <wink@google.com> | 2014-05-01 18:03:57 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-01 18:03:57 +0000 |
| commit | 51d427ca9bca22d709f2940fb949cb38892c28a7 (patch) | |
| tree | c1434f2aba9c8754bfb5b4b4a10e21206f301580 /telephony | |
| parent | d955ad9acd45ec17f18090444382268453c8b7da (diff) | |
| parent | 437994578272f9770748b152c53ec655059d19ec (diff) | |
| download | frameworks_base-51d427ca9bca22d709f2940fb949cb38892c28a7.zip frameworks_base-51d427ca9bca22d709f2940fb949cb38892c28a7.tar.gz frameworks_base-51d427ca9bca22d709f2940fb949cb38892c28a7.tar.bz2 | |
am 43799457: am 74ec5808: am 7e411f74: Merge "Add support for NETWORK_TYPE_GSM"
* commit '437994578272f9770748b152c53ec655059d19ec':
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 407a8d1..df972d5 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -911,6 +911,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. @@ -1002,6 +1004,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: @@ -1068,6 +1071,8 @@ public class TelephonyManager { return "iDEN"; case NETWORK_TYPE_HSPAP: return "HSPA+"; + case NETWORK_TYPE_GSM: + return "GSM"; default: return "UNKNOWN"; } |