From f5ff770f70cedd8af250747218dfcb3840e2f3c2 Mon Sep 17 00:00:00 2001 From: Chalard Jean Date: Thu, 7 Nov 2019 19:16:09 +0900 Subject: [PATCH] [NS A11] Small refactor Test: ConnectivityServiceTest Change-Id: I9c4247e0ed67c76d10575bd1a8fb5ff7780a1206 --- .../core/java/com/android/server/ConnectivityService.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 7d7104ce38..b446a4aca1 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -6350,7 +6350,6 @@ public class ConnectivityService extends IConnectivityManager.Stub private void rematchNetworkAndRequests(NetworkAgentInfo newNetwork, long now) { ensureRunningOnConnectivityServiceThread(); if (!newNetwork.everConnected) return; - boolean keep = newNetwork.isVPN(); boolean isNewDefault = false; NetworkAgentInfo oldDefaultNetwork = null; @@ -6392,7 +6391,6 @@ public class ConnectivityService extends IConnectivityManager.Stub Slog.wtf(TAG, "BUG: " + newSatisfier.name() + " already has " + nri.request); } addedRequests.add(nri); - keep = true; // Tell NetworkFactories about the new score, so they can stop // trying to connect if they know they cannot match it. // TODO - this could get expensive if we have a lot of requests for this @@ -6499,7 +6497,7 @@ public class ConnectivityService extends IConnectivityManager.Stub notifyLockdownVpn(newNetwork); } - if (keep) { + if (reassignedRequests.containsValue(newNetwork) || newNetwork.isVPN()) { // Notify battery stats service about this network, both the normal // interface and any stacked links. // TODO: Avoid redoing this; this must only be done once when a network comes online.