Merge "Update LegacyTypeTracker state before sending connect broadcasts." into lmp-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
d4a26e96c2
@@ -516,11 +516,13 @@ public class ConnectivityService extends IConnectivityManager.Stub {
|
|||||||
return;
|
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);
|
maybeLogBroadcast(nai, true, type);
|
||||||
sendLegacyNetworkBroadcast(nai, true, type);
|
sendLegacyNetworkBroadcast(nai, true, type);
|
||||||
}
|
}
|
||||||
list.add(nai);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Removes the given network from the specified legacy type list. */
|
/** Removes the given network from the specified legacy type list. */
|
||||||
|
|||||||
Reference in New Issue
Block a user