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

* commit 'd4a26e96c2e7f53c5a4f842bd2d04b28242b6611':
  Update LegacyTypeTracker state before sending connect broadcasts.
This commit is contained in:
Lorenzo Colitti
2014-10-01 00:52:34 +00:00
committed by Android Git Automerger

View File

@@ -516,11 +516,13 @@ public class ConnectivityService extends IConnectivityManager.Stub {
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. */