Merge "[NS A41] Cut out a function to update NAI info" am: f0be137c05 am: bbbcec376c am: ac9ce40d70 (7a59ea4c) · Commits · e / os / android_frameworks_base

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

+27 −27

Original line number	Diff line number	Diff line
		@@ -6665,6 +6665,14 @@ public class ConnectivityService extends IConnectivityManager.Stub
		final NetworkAgentInfo newSatisfier = entry.getValue();
		changes.addRequestReassignment(new NetworkReassignment.RequestReassignment(
		nri, previousSatisfier, newSatisfier));
		updateSatisfiersForRematchRequest(nri, previousSatisfier, newSatisfier, now);
		}
		}

		private void updateSatisfiersForRematchRequest(@NonNull final NetworkRequestInfo nri,
		@Nullable final NetworkAgentInfo previousSatisfier,
		@Nullable final NetworkAgentInfo newSatisfier,
		final long now) {
		if (newSatisfier != null) {
		if (VDBG) log("rematch for " + newSatisfier.name());
		if (previousSatisfier != null) {
		@@ -6681,22 +6689,14 @@ public class ConnectivityService extends IConnectivityManager.Stub
		Slog.wtf(TAG, "BUG: " + newSatisfier.name() + " already has " + nri.request);
		}
		} else {
		// 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
		// match "newNetwork" before this loop will encounter a "currentNetwork" with higher
		// score than "newNetwork" and where "currentNetwork" no longer satisfies "nri".
		// This means this code doesn't have to handle the case where "currentNetwork" no
		// longer satisfies "nri" when "currentNetwork" does not equal "newNetwork".
		if (DBG) {
		log("Network " + newNetwork.name() + " stopped satisfying" +
		" request " + nri.request.requestId);
		log("Network " + previousSatisfier.name() + " stopped satisfying"
		+ " request " + nri.request.requestId);
		}
		newNetwork.removeRequest(nri.request.requestId);
		previousSatisfier.removeRequest(nri.request.requestId);
		}
		nri.mSatisfier = newSatisfier;
		}
		}

		/**
		* Attempt to rematch all Networks with NetworkRequests. This may result in Networks