Merge "Don't allow an uncreated Network to satsify requests." into lmp-mr1-dev (0653f508) · Commits · e / os / android_frameworks_base

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

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -3973,7 +3973,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
	// another higher scoring network by another call to rematchNetworkAndRequests()		// another higher scoring network by another call to rematchNetworkAndRequests()
	// and this other call also lingered newNetwork.		// and this other call also lingered newNetwork.
	private void rematchNetworkAndRequests(NetworkAgentInfo newNetwork, boolean nascent) {		private void rematchNetworkAndRequests(NetworkAgentInfo newNetwork, boolean nascent) {
	if (!newNetwork.created) loge("ERROR: uncreated network being rematched.");		if (!newNetwork.created) return;
	if (nascent && !newNetwork.validated) loge("ERROR: nascent network not validated.");		if (nascent && !newNetwork.validated) loge("ERROR: nascent network not validated.");
	boolean keep = newNetwork.isVPN();		boolean keep = newNetwork.isVPN();
	boolean isNewDefault = false;		boolean isNewDefault = false;
	@@ -4272,7 +4272,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
	final int oldScore = nai.getCurrentScore();		final int oldScore = nai.getCurrentScore();
	nai.setCurrentScore(score);		nai.setCurrentScore(score);

	if (nai.created) rematchAllNetworksAndRequests(nai, oldScore);		rematchAllNetworksAndRequests(nai, oldScore);

	sendUpdatedScoreToFactories(nai);		sendUpdatedScoreToFactories(nai);
	}		}