diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-06-07 12:00:37 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-07 12:00:37 -0700 |
| commit | 8de47a2f25a9379c44f220f0bd0f25585bfbc9fb (patch) | |
| tree | 8a990de907e1f501bef95ac916fbb50070c28ff2 /telephony/java/android | |
| parent | a476813dccec241632810c1cbb11bcfbf17841b0 (diff) | |
| parent | 97ab2d4f86ee9c2b661a00688e934fc7030df22e (diff) | |
| download | frameworks_base-8de47a2f25a9379c44f220f0bd0f25585bfbc9fb.zip frameworks_base-8de47a2f25a9379c44f220f0bd0f25585bfbc9fb.tar.gz frameworks_base-8de47a2f25a9379c44f220f0bd0f25585bfbc9fb.tar.bz2 | |
Merge "Reveal some network constants." into honeycomb-mr2
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 23b67e3..5a417b3 100644 --- a/telephony/java/android/telephony/TelephonyManager.java +++ b/telephony/java/android/telephony/TelephonyManager.java @@ -427,8 +427,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; /** @@ -451,6 +450,7 @@ public class TelephonyManager { * @see #NETWORK_TYPE_IDEN * @see #NETWORK_TYPE_LTE * @see #NETWORK_TYPE_EHRPD + * @see #NETWORK_TYPE_HSPAP */ public int getNetworkType() { try{ @@ -507,6 +507,8 @@ public class TelephonyManager { return "CDMA - eHRPD"; case NETWORK_TYPE_IDEN: return "iDEN"; + case NETWORK_TYPE_HSPAP: + return "HSPA+"; default: return "UNKNOWN"; } |