diff --git a/service/src/com/android/server/ConnectivityService.java b/service/src/com/android/server/ConnectivityService.java index 1caca01256..fe14e5ff9a 100644 --- a/service/src/com/android/server/ConnectivityService.java +++ b/service/src/com/android/server/ConnectivityService.java @@ -7495,9 +7495,7 @@ public class ConnectivityService extends IConnectivityManager.Stub notifyIfacesChangedForNetworkStats(); networkAgent.networkMonitor().notifyLinkPropertiesChanged( new LinkProperties(newLp, true /* parcelSensitiveFields */)); - if (networkAgent.everConnected) { - notifyNetworkCallbacks(networkAgent, ConnectivityManager.CALLBACK_IP_CHANGED); - } + notifyNetworkCallbacks(networkAgent, ConnectivityManager.CALLBACK_IP_CHANGED); } mKeepaliveTracker.handleCheckKeepalivesStillValid(networkAgent); @@ -8749,9 +8747,6 @@ public class ConnectivityService extends IConnectivityManager.Stub // Gather the list of all relevant agents. final ArrayList nais = new ArrayList<>(); for (final NetworkAgentInfo nai : mNetworkAgentInfos) { - if (!nai.everConnected) { - continue; - } nais.add(nai); } @@ -8875,7 +8870,6 @@ public class ConnectivityService extends IConnectivityManager.Stub } for (final NetworkAgentInfo nai : nais) { - if (!nai.everConnected) continue; final boolean oldBackground = oldBgNetworks.contains(nai); // Process listen requests and update capabilities if the background state has // changed for this network. For consistency with previous behavior, send onLost @@ -9468,7 +9462,7 @@ public class ConnectivityService extends IConnectivityManager.Stub } } for (NetworkAgentInfo nai : mNetworkAgentInfos) { - if (nai.everConnected && (activeNetIds.contains(nai.network().netId) || nai.isVPN())) { + if (activeNetIds.contains(nai.network().netId) || nai.isVPN()) { defaultNetworks.add(nai.network); } } diff --git a/service/src/com/android/server/connectivity/NetworkAgentInfo.java b/service/src/com/android/server/connectivity/NetworkAgentInfo.java index 04f378f2e0..88a5f9c44c 100644 --- a/service/src/com/android/server/connectivity/NetworkAgentInfo.java +++ b/service/src/com/android/server/connectivity/NetworkAgentInfo.java @@ -983,14 +983,13 @@ public class NetworkAgentInfo implements NetworkRanker.Scoreable { // Does this network satisfy request? public boolean satisfies(NetworkRequest request) { - return created && - request.networkCapabilities.satisfiedByNetworkCapabilities(networkCapabilities); + return everConnected + && request.networkCapabilities.satisfiedByNetworkCapabilities(networkCapabilities); } public boolean satisfiesImmutableCapabilitiesOf(NetworkRequest request) { - return created && - request.networkCapabilities.satisfiedByImmutableNetworkCapabilities( - networkCapabilities); + return everConnected && request.networkCapabilities.satisfiedByImmutableNetworkCapabilities( + networkCapabilities); } /** Whether this network is a VPN. */