LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'gingerbread' into gingerbread-release

Browse Source
This commit is contained in:
The Android Automerger
2010-09-16 09:39:15 -07:00
parent 19c7b34934 d3401f9b40
commit 16f3dfe9d3
2 changed files with 21 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,6 +123,17 @@ public class ConnectivityManager
public static final String ACTION_BACKGROUND_DATA_SETTING_CHANGED =
"android.net.conn.BACKGROUND_DATA_SETTING_CHANGED";
/**
* Broadcast Action: The network connection may not be good
* uses {@code ConnectivityManager.EXTRA_INET_CONDITION} and
* {@code ConnectivityManager.EXTRA_NETWORK_INFO} to specify
* the network and it's condition.
* @hide
*/
public static final String INET_CONDITION_ACTION =
"android.net.conn.INET_CONDITION_ACTION";
/**
* Broadcast Action: A tetherable connection has come or gone
* TODO - finish the doc

12
services/java/com/android/server/ConnectivityService.java
View File

@@ -1008,7 +1008,15 @@ public class ConnectivityService extends IConnectivityManager.Stub {
}
private void sendConnectedBroadcast(NetworkInfo info) {
Intent intent = new Intent(ConnectivityManager.CONNECTIVITY_ACTION);
sendGeneralBroadcast(info, ConnectivityManager.CONNECTIVITY_ACTION);
}
private void sendInetConditionBroadcast(NetworkInfo info) {
sendGeneralBroadcast(info, ConnectivityManager.INET_CONDITION_ACTION);
}
private void sendGeneralBroadcast(NetworkInfo info, String bcastType) {
Intent intent = new Intent(bcastType);
intent.putExtra(ConnectivityManager.EXTRA_NETWORK_INFO, info);
if (info.isFailover()) {
intent.putExtra(ConnectivityManager.EXTRA_IS_FAILOVER, true);
@@ -1512,7 +1520,7 @@ public class ConnectivityService extends IConnectivityManager.Stub {
break;
}
mDefaultInetConditionPublished = mDefaultInetCondition;
sendConnectedBroadcast(networkInfo);
sendInetConditionBroadcast(networkInfo);
break;
}
}