Merge "Don't send onLinkPropertiesChanged after onLost for 464xlat."

This commit is contained in:
Lorenzo Colitti
2021-06-09 07:59:25 +00:00
committed by Gerrit Code Review
3 changed files with 6 additions and 12 deletions

View File

@@ -6299,8 +6299,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
// there may not be a strict 1:1 correlation between the two.
private final NetIdManager mNetIdManager;
// NetworkAgentInfo keyed off its connecting messenger
// TODO - eval if we can reduce the number of lists/hashmaps/sparsearrays
// Tracks all NetworkAgents that are currently registered.
// NOTE: Only should be accessed on ConnectivityServiceThread, except dump().
private final ArraySet<NetworkAgentInfo> mNetworkAgentInfos = new ArraySet<>();
@@ -7452,7 +7451,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
public void handleUpdateLinkProperties(NetworkAgentInfo nai, LinkProperties newLp) {
ensureRunningOnConnectivityServiceThread();
if (getNetworkAgentInfoForNetId(nai.network.getNetId()) != nai) {
if (!mNetworkAgentInfos.contains(nai)) {
// Ignore updates for disconnected networks
return;
}