diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-06-07 12:45:41 -0700 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2011-06-07 12:45:41 -0700 |
| commit | 5df69fad6e5021d2862bff0553a510f8d6729fbd (patch) | |
| tree | 61eab9273e80276b65498c6f1f987574ff75b62d /telephony/java/android | |
| parent | 212d15c746f2611339026c16e5fa1aeb7f9090b7 (diff) | |
| parent | 8de47a2f25a9379c44f220f0bd0f25585bfbc9fb (diff) | |
| download | frameworks_base-5df69fad6e5021d2862bff0553a510f8d6729fbd.zip frameworks_base-5df69fad6e5021d2862bff0553a510f8d6729fbd.tar.gz frameworks_base-5df69fad6e5021d2862bff0553a510f8d6729fbd.tar.bz2 | |
resolved conflicts for merge of 8de47a2f to honeycomb-LTE
Change-Id: I8193235a4c7e574635e17b2eb05bb5420a3c6749
Diffstat (limited to 'telephony/java/android')
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/telephony/java/android/telephony/TelephonyManager.java b/telephony/java/android/telephony/TelephonyManager.java index 8732e21..acbf08b 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -426,8 +426,7 @@ public class TelephonyManager { public static final int NETWORK_TYPE_LTE = 13; /** Current network is eHRPD */ public static final int NETWORK_TYPE_EHRPD = 14; - /** Current network is HSPA+ - * @hide */ + /** Current network is HSPA+ */ public static final int NETWORK_TYPE_HSPAP = 15; /** @@ -450,6 +449,7 @@ public class TelephonyManager { * @see #NETWORK_TYPE_IDEN * @see #NETWORK_TYPE_LTE * @see #NETWORK_TYPE_EHRPD + * @see #NETWORK_TYPE_HSPAP */ public int getNetworkType() { try{ @@ -506,6 +506,8 @@ public class TelephonyManager { return "CDMA - eHRPD"; case NETWORK_TYPE_IDEN: return "iDEN"; + case NETWORK_TYPE_HSPAP: + return "HSPA+"; default: return "UNKNOWN"; } |