From ed295c52b2a176613e76ca08bb5312450d049150 Mon Sep 17 00:00:00 2001 From: Chalard Jean Date: Thu, 7 Nov 2019 18:22:23 +0900 Subject: [PATCH] [NS A06] Move more side effects out of the decision loop This is a no-op. Bug: 113554781 Test: ConnectivityServiceTest Change-Id: I493b969c278097a289a1ef689ca268606227ae79 --- .../java/com/android/server/ConnectivityService.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 49ac9db958..d714db7960 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -6352,14 +6352,7 @@ public class ConnectivityService extends IConnectivityManager.Stub ensureRunningOnConnectivityServiceThread(); final NetworkAgentInfo currentNetwork = nri.mSatisfier; final boolean satisfies = newNetwork.satisfies(nri.request); - if (newNetwork == currentNetwork && satisfies) { - if (VDBG) { - log("Network " + newNetwork.name() + " was already satisfying" + - " request " + nri.request.requestId + ". No change."); - } - keep = true; - continue; - } + if (newNetwork == currentNetwork && satisfies) continue; // check if it satisfies the NetworkCapabilities if (VDBG) log(" checking if request is satisfied: " + nri.request); @@ -6414,7 +6407,8 @@ public class ConnectivityService extends IConnectivityManager.Stub reassignedRequests.entrySet()) { final NetworkRequestInfo nri = entry.getKey(); final NetworkAgentInfo previousSatisfier = nri.mSatisfier; - if (entry.getValue() == null) { + final NetworkAgentInfo newSatisfier = entry.getValue(); + if (newSatisfier == null) { // If "newNetwork" is listed as satisfying "nri" but no longer satisfies "nri", // mark it as no longer satisfying "nri". Because networks are processed by // rematchAllNetworksAndRequests() in descending score order, "currentNetwork" will