diff options
| author | Wink Saville <wink@google.com> | 2014-05-01 17:53:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-01 17:53:55 +0000 |
| commit | 7e411f74efe6dd383e59634760cccd96da1c209b (patch) | |
| tree | ef36c176f6c8a787da02b9c99059b58a4e9136b4 | |
| parent | ab3977d21161815c130bdedf21e2571382d208da (diff) | |
| parent | 10731a6140ad9e1be895406206ced1db7b6d85cd (diff) | |
| download | base-7e411f74efe6dd383e59634760cccd96da1c209b.tar.gz | |
Merge "Add support for NETWORK_TYPE_GSM"
| -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 606fcb4239e5..1ee390fb90b3 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 35d63c068f44..612f327644e1 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -872,6 +872,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. @@ -963,6 +965,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: @@ -1029,6 +1032,8 @@ public class TelephonyManager { return "iDEN"; case NETWORK_TYPE_HSPAP: return "HSPA+"; + case NETWORK_TYPE_GSM: + return "GSM"; default: return "UNKNOWN"; } |