diff options
| author | Robert Greenwalt <rgreenwalt@google.com> | 2011-06-08 10:01:06 -0700 |
|---|---|---|
| committer | Robert Greenwalt <rgreenwalt@google.com> | 2011-06-08 10:01:06 -0700 |
| commit | 8a02401129e5805025d3a39e552a2840e73fb8cf (patch) | |
| tree | 4be79f83f5a169bf01cb31ce4c3dc22f580ebae2 /telephony/java/android | |
| parent | 3932aa7ff887007f4ae1e28e47b6775c9ceca566 (diff) | |
| parent | e139167c9109aee203f5fbbdeeab656994d9c9ac (diff) | |
| download | frameworks_base-8a02401129e5805025d3a39e552a2840e73fb8cf.zip frameworks_base-8a02401129e5805025d3a39e552a2840e73fb8cf.tar.gz frameworks_base-8a02401129e5805025d3a39e552a2840e73fb8cf.tar.bz2 | |
resolved conflicts for merge of e139167c to master
Change-Id: Ic4d8aae7dd457457d9cc8ba081b273e425729f86
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 7272b08..66120a1 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{ @@ -551,6 +551,8 @@ public class TelephonyManager { return "CDMA - eHRPD"; case NETWORK_TYPE_IDEN: return "iDEN"; + case NETWORK_TYPE_HSPAP: + return "HSPA+"; default: return "UNKNOWN"; } |