summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Robert Greenwalt <robdroid@android.com> 2010-08-24 15:21:08 -0700
committer Android Git Automerger <android-git-automerger@android.com> 2010-08-24 15:21:08 -0700
commit3ded7cb58cd5b31b712e95f9cfecf86f69fb4cae (patch)
treee43c990e412ad3d04d4f52437a468f901194d6c2
parent96ca16a9a877c4d161933100edbb5f1232b4d415 (diff)
parent510f9f869fea26b5c11bfc738e7637c988e9d3d0 (diff)
am 510f9f86: am 6d734693: Merge "Send all Connectivity broadcasts." into gingerbread
Merge commit '510f9f869fea26b5c11bfc738e7637c988e9d3d0' * commit '510f9f869fea26b5c11bfc738e7637c988e9d3d0': Send all Connectivity broadcasts.
-rw-r--r--services/java/com/android/server/ConnectivityService.java3
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 4da0bac4ea52..bd2a0eaa6b1f 100644
--- a/services/java/com/android/server/ConnectivityService.java
+++ b/services/java/com/android/server/ConnectivityService.java
@@ -943,7 +943,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);
@@ -1059,7 +1058,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);
@@ -1097,7 +1095,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);