Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 0653f508: Merge "Don\'t allow an uncreated Network to satsify requests." into lmp-mr1-dev

Browse Source 
* commit '0653f508b58eab994089ae2da783852a5c1b4a8a':
  Don't allow an uncreated Network to satsify requests.
This commit is contained in:
Paul Jensen
2014-11-21 12:47:23 +00:00
committed by Android Git Automerger
parent 8a2ac41dcf 0653f508b5
commit 934b73fb50
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()
// and this other call also lingered newNetwork.
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.");
boolean keep = newNetwork.isVPN();
boolean isNewDefault = false;
@@ -4272,7 +4272,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
final int oldScore = nai.getCurrentScore();
nai.setCurrentScore(score);
if (nai.created) rematchAllNetworksAndRequests(nai, oldScore);
rematchAllNetworksAndRequests(nai, oldScore);
sendUpdatedScoreToFactories(nai);
}