commit 3ac71b7f870e6b0a2bb03fceeba8d330830a7412
author Robert Greenwalt <rgreenwalt@google.com> Fri Jul 10 16:00:36 2015 -0700
committer Robert Greenwalt <rgreenwalt@google.com> Fri Jul 10 16:26:40 2015 -0700
tree 70e5c94568b0fcc5fcefd15cb84a07d90861ab13
parent 6795a2aeafa6df8a5e8e3045d29991d33c8db33f

Fix filter on CONNECTIVITY_ACTION updates

Only send for network types which the network supports.

bug:22411968
Change-Id: I97765544eb653caf0ea4fc5d3feec5742d5d88dc

services/core/java/com/android/server/ConnectivityService.java

diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
index 39c2891..daac5210 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -559,8 +559,9 @@
             final DetailedState state = nai.networkInfo.getDetailedState();
             for (int type = 0; type < mTypeLists.length; type++) {
                 final ArrayList<NetworkAgentInfo> list = mTypeLists[type];
+                final boolean contains = (list != null && list.contains(nai));
                 final boolean isFirst = (list != null && list.size() > 0 && nai == list.get(0));
-                if (isFirst || isDefault) {
+                if (isFirst || (contains && isDefault)) {
                     maybeLogBroadcast(nai, state, type, isDefault);
                     sendLegacyNetworkBroadcast(nai, state, type);
                 }