diff options
| author | Robert Greenwalt <robdroid@android.com> | 2010-08-24 12:04:52 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-24 12:04:52 -0700 |
| commit | 510f9f869fea26b5c11bfc738e7637c988e9d3d0 (patch) | |
| tree | 028404f34e667a087575ae1d98df9c5b49c255fd /services/java | |
| parent | 9765b2a01d32ea6f2f955170ef7d0185e2252b0a (diff) | |
| parent | 6d7346933580c107f461885dc273d7298a46b0df (diff) | |
| download | frameworks_base-510f9f869fea26b5c11bfc738e7637c988e9d3d0.zip frameworks_base-510f9f869fea26b5c11bfc738e7637c988e9d3d0.tar.gz frameworks_base-510f9f869fea26b5c11bfc738e7637c988e9d3d0.tar.bz2 | |
am 6d734693: Merge "Send all Connectivity broadcasts." into gingerbread
Merge commit '6d7346933580c107f461885dc273d7298a46b0df' into gingerbread-plus-aosp
* commit '6d7346933580c107f461885dc273d7298a46b0df':
Send all Connectivity broadcasts.
Diffstat (limited to 'services/java')
| -rw-r--r-- | services/java/com/android/server/ConnectivityService.java | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/services/java/com/android/server/ConnectivityService.java b/services/java/com/android/server/ConnectivityService.java index 041c13b..c751f3d 100644 --- a/services/java/com/android/server/ConnectivityService.java +++ b/services/java/com/android/server/ConnectivityService.java @@ -889,7 +889,6 @@ public class ConnectivityService extends IConnectivityManager.Stub { } Intent intent = new Intent(ConnectivityManager.CONNECTIVITY_ACTION); - intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING); intent.putExtra(ConnectivityManager.EXTRA_NETWORK_INFO, info); if (info.isFailover()) { intent.putExtra(ConnectivityManager.EXTRA_IS_FAILOVER, true); @@ -1005,7 +1004,6 @@ public class ConnectivityService extends IConnectivityManager.Stub { private void sendConnectedBroadcast(NetworkInfo info) { Intent intent = new Intent(ConnectivityManager.CONNECTIVITY_ACTION); - intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING); intent.putExtra(ConnectivityManager.EXTRA_NETWORK_INFO, info); if (info.isFailover()) { intent.putExtra(ConnectivityManager.EXTRA_IS_FAILOVER, true); @@ -1043,7 +1041,6 @@ public class ConnectivityService extends IConnectivityManager.Stub { } Intent intent = new Intent(ConnectivityManager.CONNECTIVITY_ACTION); - intent.addFlags(Intent.FLAG_RECEIVER_REPLACE_PENDING); intent.putExtra(ConnectivityManager.EXTRA_NETWORK_INFO, info); if (getActiveNetworkInfo() == null) { intent.putExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY, true); |