Merge "[NS A42] Move writing to the reassignment to the computation" (9b8a767c) · Commits · e / os / android_frameworks_base

services/core/java/com/android/server/ConnectivityService.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -6620,9 +6620,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;
		@@ -6663,8 +6667,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);
		}
		}