diff options
| author | Sandeep Kunta <skunta@codeaurora.org> | 2013-08-10 20:55:38 +0530 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2013-11-12 01:18:59 -0800 |
| commit | 13590cf7f4a19f9b92b055969715f2906bbe307e (patch) | |
| tree | 5da98cbe8d96c9d620d9cf5457dfa1ef69f0d62c | |
| parent | 982700e7204ea6af3e4290b5f3c6ee8d28acd2e4 (diff) | |
| download | android_frameworks_base-13590cf7f4a19f9b92b055969715f2906bbe307e.tar.gz android_frameworks_base-13590cf7f4a19f9b92b055969715f2906bbe307e.tar.bz2 android_frameworks_base-13590cf7f4a19f9b92b055969715f2906bbe307e.zip | |
Telephony: Add support for NETWORK_TYPE_GSM
Add support for NETWORK_TYPE_GSM in TelephonyManager and
corresponding mapping in ServicState.java so that when
application queries getVoiceNetworkType() and currently
camped rat is GSM, they get network mode as GSM instead
of network mode unknown.
Change-Id: I5e971c625532696776b9555ad8cfd85eba4fc423
CRs-Fixed: 526435
(cherry picked from commit 3e01fcec13725955f0ca3fb20730ff21f4edc128)
(cherry picked from commit c70f5687965908cd585e52901cf6cd88bd405140)
(cherry picked from commit 8e3c2300729ecb3cd3e6b640b0174f49e2189f0c)
| -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 adf058c3258..857adbfb1c5 100644 --- a/telephony/java/android/telephony/ServiceState.java +++ b/telephony/java/android/telephony/ServiceState.java @@ -801,6 +801,8 @@ public class ServiceState implements Parcelable { case ServiceState.RIL_RADIO_TECHNOLOGY_HSPAP: case ServiceState.RIL_RADIO_TECHNOLOGY_DCHSPAP: 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 0e5e78f1f6f..d0ca242a331 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -620,6 +620,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. @@ -722,6 +724,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: @@ -788,6 +791,8 @@ public class TelephonyManager { return "iDEN"; case NETWORK_TYPE_HSPAP: return "HSPA+"; + case NETWORK_TYPE_GSM: + return "GSM"; default: return "UNKNOWN"; } |