commit 204b77ac876f5759f57912d807c3bab69dd45132
author Erik Kline <ek@google.com> Tue Jul 14 04:09:25 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jul 14 04:09:29 2015 +0000
tree dbe71465836bece4a020873f471115c687d8a93d
parent 3df86c6974d1bb4d5be96d0b0ddf8a51c615d15b
parent edf878bedb1910ff904f88f2dc2bc64a3e33761e

Merge "Log NetworkRequestInfo to get more detailed history" into mnc-dev

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 9b1e26a..eb74ab0 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -563,8 +563,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);
                 }