joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Don't allow an uncreated Network to satsify requests." into lmp-mr1-dev

Browse source
This commit is contained in:
Paul Jensen 2014-11-21 12:42:32 +00:00 • committed by Android (Google) Code Review
commit 9f8f78ca78
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
services/core/java/com/android/server/ConnectivityService.java
View file

@ -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);
} }