LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Don't accept score below 0." into lmp-dev

Browse Source
This commit is contained in:
Robert Greenwalt
2014-09-10 19:30:21 +00:00
committed by Android (Google) Code Review
parent 1470f9bc83 31475db1a4
commit 2ea88e8ece
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/java/android/net/NetworkAgent.java
View File

@@ -223,6 +223,9 @@ public abstract class NetworkAgent extends Handler {
* Called by the bearer code when it has a new score for this network. * Called by the bearer code when it has a new score for this network.
*/ */
public void sendNetworkScore(int score) { public void sendNetworkScore(int score) {
if (score < 0) {
throw new IllegalArgumentException("Score must be >= 0");
}
queueOrSendMessage(EVENT_NETWORK_SCORE_CHANGED, new Integer(score)); queueOrSendMessage(EVENT_NETWORK_SCORE_CHANGED, new Integer(score));
} }

5
services/core/java/com/android/server/ConnectivityService.java
View File

@@ -4746,6 +4746,11 @@ public class ConnectivityService extends IConnectivityManager.Stub {
private void updateNetworkScore(NetworkAgentInfo nai, int score) { private void updateNetworkScore(NetworkAgentInfo nai, int score) {
if (DBG) log("updateNetworkScore for " + nai.name() + " to " + score); if (DBG) log("updateNetworkScore for " + nai.name() + " to " + score);
if (score < 0) {
loge("updateNetworkScore for " + nai.name() + " got a negative score (" + score +
"). Bumping score to min of 0");
score = 0;
}
nai.currentScore = score; nai.currentScore = score;