From 383f5ef79acfaeda4fa905e68e1663cbbbca65d0 Mon Sep 17 00:00:00 2001 From: Chalard Jean Date: Tue, 3 Dec 2019 23:37:28 +0900 Subject: [PATCH] [NS A42] Move writing to the reassignment to the computation ...instead of the side effect loop. This is a no-op refactoring. Test: ConnectivityServiceTest Change-Id: I8308d55eaff080efb22a7a43142492545e626cf5 --- .../core/java/com/android/server/ConnectivityService.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index cb06d9da6f..b382922c1a 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -6591,9 +6591,13 @@ public class ConnectivityService extends IConnectivityManager.Stub } if (currentNetwork == null || currentNetwork.getCurrentScore() < score) { reassignedRequests.put(nri, newNetwork); + changes.addRequestReassignment(new NetworkReassignment.RequestReassignment( + nri, currentNetwork, newNetwork)); } } else if (newNetwork == currentNetwork) { reassignedRequests.put(nri, null); + changes.addRequestReassignment(new NetworkReassignment.RequestReassignment( + nri, currentNetwork, null)); } } return reassignedRequests; @@ -6634,8 +6638,6 @@ public class ConnectivityService extends IConnectivityManager.Stub final NetworkRequestInfo nri = entry.getKey(); final NetworkAgentInfo previousSatisfier = nri.mSatisfier; final NetworkAgentInfo newSatisfier = entry.getValue(); - changes.addRequestReassignment(new NetworkReassignment.RequestReassignment( - nri, previousSatisfier, newSatisfier)); updateSatisfiersForRematchRequest(nri, previousSatisfier, newSatisfier, now); } }