diff options
| -rw-r--r-- | api/current.xml | 33 | ||||
| -rw-r--r-- | core/java/android/net/ConnectivityManager.java | 18 | ||||
| -rw-r--r-- | telephony/java/android/telephony/TelephonyManager.java | 6 |
3 files changed, 46 insertions, 11 deletions
diff --git a/api/current.xml b/api/current.xml index 0fa463b..4841d01 100644 --- a/api/current.xml +++ b/api/current.xml @@ -114498,6 +114498,28 @@ visibility="public" > </field> +<field name="TYPE_BLUETOOTH" + type="int" + transient="false" + volatile="false" + value="7" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> +<field name="TYPE_ETHERNET" + type="int" + transient="false" + volatile="false" + value="9" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="TYPE_MOBILE" type="int" transient="false" @@ -184537,6 +184559,17 @@ visibility="public" > </field> +<field name="NETWORK_TYPE_HSPAP" + type="int" + transient="false" + volatile="false" + value="15" + static="true" + final="true" + deprecated="not deprecated" + visibility="public" +> +</field> <field name="NETWORK_TYPE_HSUPA" type="int" transient="false" diff --git a/core/java/android/net/ConnectivityManager.java b/core/java/android/net/ConnectivityManager.java index b541ec3..eaf9191 100644 --- a/core/java/android/net/ConnectivityManager.java +++ b/core/java/android/net/ConnectivityManager.java @@ -165,14 +165,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; /** @@ -208,21 +206,23 @@ 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. - * @hide + * The Default Bluetooth data connection. When active, all data traffic + * will use this connection by default. */ public static final int TYPE_BLUETOOTH = 7; /** {@hide} */ public static final int TYPE_DUMMY = 8; - /** {@hide} */ + /** + * The Default Ethernet data connection. When active, all data traffic + * will use this connection by default. + */ public static final int TYPE_ETHERNET = 9; /** * Over the air Adminstration. 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"; } |