commit d4a26e96c2e7f53c5a4f842bd2d04b28242b6611
author Lorenzo Colitti <lorenzo@google.com> Tue Sep 30 03:05:47 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Sep 30 03:05:49 2014 +0000
tree b254ede53162099d909917c73eb50d6c9a5d14a2
parent ebeaecde71b34ba32a2cc602c09e4822b8ecbf97
parent 4b584064d2537da87a4979fd39c18bc549aa3d65

Merge "Update LegacyTypeTracker state before sending connect broadcasts." into lmp-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 0b1a627..85ab249 100644
--- a/services/core/java/com/android/server/ConnectivityService.java
+++ b/services/core/java/com/android/server/ConnectivityService.java
@@ -516,11 +516,13 @@
                 return;
             }
 
-            if (list.isEmpty() || isDefaultNetwork(nai)) {
+            list.add(nai);
+
+            // Send a broadcast if this is the first network of its type or if it's the default.
+            if (list.size() == 1 || isDefaultNetwork(nai)) {
                 maybeLogBroadcast(nai, true, type);
                 sendLegacyNetworkBroadcast(nai, true, type);
             }
-            list.add(nai);
         }
 
         /** Removes the given network from the specified legacy type list. */