diff options
| -rw-r--r-- | api/current.txt | 1 | ||||
| -rw-r--r-- | core/java/android/net/ConnectivityManager.java | 16 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 6 |
3 files changed, 12 insertions, 11 deletions
diff --git a/api/current.txt b/api/current.txt index 80d0687..dc82cd8 100644 --- a/api/current.txt +++ b/api/current.txt @@ -17818,6 +17818,7 @@ package android.telephony { field public static final int NETWORK_TYPE_GPRS = 1; // 0x1 field public static final int NETWORK_TYPE_HSDPA = 8; // 0x8 field public static final int NETWORK_TYPE_HSPA = 10; // 0xa + field public static final int NETWORK_TYPE_HSPAP = 15; // 0xf field public static final int NETWORK_TYPE_HSUPA = 9; // 0x9 field public static final int NETWORK_TYPE_IDEN = 11; // 0xb field public static final int NETWORK_TYPE_LTE = 13; // 0xd diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index 21cce44..ea750da 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -164,14 +164,12 @@ public class ConnectivityManager { /** * The Default Mobile data connection. When active, all data traffic - * will use this connection by default. Should not coexist with other - * default connections. + * will use this connection by default. */ public static final int TYPE_MOBILE = 0; /** * The Default WIFI data connection. When active, all data traffic - * will use this connection by default. Should not coexist with other - * default connections. + * will use this connection by default. */ public static final int TYPE_WIFI = 1; /** @@ -207,13 +205,13 @@ public class ConnectivityManager { public static final int TYPE_MOBILE_HIPRI = 5; /** * The Default WiMAX data connection. When active, all data traffic - * will use this connection by default. Should not coexist with other - * default connections. + * will use this connection by default. */ public static final int TYPE_WIMAX = 6; /** - * Bluetooth data connection. This is used for Bluetooth reverse tethering. + * The Default Bluetooth data connection. When active, all data traffic + * will use this connection by default. */ public static final int TYPE_BLUETOOTH = 7; @@ -223,8 +221,8 @@ public class ConnectivityManager { public static final int TYPE_DUMMY = 8; /** - * Ethernet data connection. This may be via USB dongle or more - * traditional means. + * The Default Ethernet data connection. When active, all data traffic + * will use this connection by default. */ public static final int TYPE_ETHERNET = 9; 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"; } |