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

Merge "NetworkAgent: Send primitive integer in score" am: 45190f8e7f

Browse Source 
am: c039ad203e

Change-Id: I7f6ac7a5fd6ecae4ac077b7f54fe91879a63fa13
This commit is contained in:
Roshan Pius
2018-08-10 08:54:21 -07:00
committed by android-build-merger
parent 0af00d4866 45190f8e7f
commit d1900ecd7d
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -372,7 +372,7 @@ public abstract class NetworkAgent extends Handler {
if (score < 0) { if (score < 0) {
throw new IllegalArgumentException("Score must be >= 0"); throw new IllegalArgumentException("Score must be >= 0");
} }
queueOrSendMessage(EVENT_NETWORK_SCORE_CHANGED, new Integer(score)); queueOrSendMessage(EVENT_NETWORK_SCORE_CHANGED, score, 0);
} }
/** /**

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

@@ -2194,8 +2194,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
break; break;
} }
case NetworkAgent.EVENT_NETWORK_SCORE_CHANGED: { case NetworkAgent.EVENT_NETWORK_SCORE_CHANGED: {
Integer score = (Integer) msg.obj; updateNetworkScore(nai, msg.arg1);
if (score != null) updateNetworkScore(nai, score.intValue());
break; break;
} }
case NetworkAgent.EVENT_SET_EXPLICITLY_SELECTED: { case NetworkAgent.EVENT_SET_EXPLICITLY_SELECTED: {