Merge "[NS A42] Move writing to the reassignment to the computation" am: 9b8a767cd6 am: 25d888115a (acd77928) · Commits · e / os / android_frameworks_base

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

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -6620,9 +6620,13 @@ public class ConnectivityService extends IConnectivityManager.Stub
	}		}
	if (currentNetwork == null \|\| currentNetwork.getCurrentScore() < score) {		if (currentNetwork == null \|\| currentNetwork.getCurrentScore() < score) {
	reassignedRequests.put(nri, newNetwork);		reassignedRequests.put(nri, newNetwork);
			changes.addRequestReassignment(new NetworkReassignment.RequestReassignment(
			nri, currentNetwork, newNetwork));
	}		}
	} else if (newNetwork == currentNetwork) {		} else if (newNetwork == currentNetwork) {
	reassignedRequests.put(nri, null);		reassignedRequests.put(nri, null);
			changes.addRequestReassignment(new NetworkReassignment.RequestReassignment(
			nri, currentNetwork, null));
	}		}
	}		}
	return reassignedRequests;		return reassignedRequests;
	@@ -6663,8 +6667,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
	final NetworkRequestInfo nri = entry.getKey();		final NetworkRequestInfo nri = entry.getKey();
	final NetworkAgentInfo previousSatisfier = nri.mSatisfier;		final NetworkAgentInfo previousSatisfier = nri.mSatisfier;
	final NetworkAgentInfo newSatisfier = entry.getValue();		final NetworkAgentInfo newSatisfier = entry.getValue();
	changes.addRequestReassignment(new NetworkReassignment.RequestReassignment(
	nri, previousSatisfier, newSatisfier));
	updateSatisfiersForRematchRequest(nri, previousSatisfier, newSatisfier, now);		updateSatisfiersForRematchRequest(nri, previousSatisfier, newSatisfier, now);
	}		}
	}		}