Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflicts for merge of e139167c to master

Browse Source 
Change-Id: Ic4d8aae7dd457457d9cc8ba081b273e425729f86
This commit is contained in:
Robert Greenwalt
2011-06-08 10:01:06 -07:00
parent 3932aa7ff8 e139167c91
commit 8a02401129
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@@ -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

16
core/java/android/net/ConnectivityManager.java
View File

@@ -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;

6
telephony/java/android/telephony/TelephonyManager.java
View File

@@ -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";
}