Merge "Update LegacyTypeTracker state before sending connect broadcasts." into lmp-dev

lcolitti · Android (Google) Code Review · commit d8f7e0482815 · 2014-09-30T03:05:49.000Z
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java
@@ -516,11 +516,13 @@ public void add(int type, NetworkAgentInfo nai) {
                 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. */

Original file line number	Diff line number	Diff line change
`@@ -516,11 +516,13 @@ public void add(int type, NetworkAgentInfo nai) {`
`516`	`516`	`return;`
`517`	`517`	`}`
`518`	`518`
`519`		`- if (list.isEmpty() \|\| isDefaultNetwork(nai)) {`
	`519`	`+ list.add(nai);`
	`520`	`+`
	`521`	`+ // Send a broadcast if this is the first network of its type or if it's the default.`
	`522`	`+ if (list.size() == 1 \|\| isDefaultNetwork(nai)) {`
`520`	`523`	`maybeLogBroadcast(nai, true, type);`
`521`	`524`	`sendLegacyNetworkBroadcast(nai, true, type);`
`522`	`525`	`}`
`523`		`- list.add(nai);`
`524`	`526`	`}`
`525`	`527`
`526`	`528`	`/** Removes the given network from the specified legacy type list. */`