diff options
| author | 2018-08-10 09:39:49 -0700 | |
|---|---|---|
| committer | 2018-08-10 09:39:49 -0700 | |
| commit | 690e90653c698fa0ae5d86a47b68c5000d817b2c (patch) | |
| tree | cdd77e3f4aec2e6b5b1665174e78fa343a1a8cdc | |
| parent | 1ce21e73f8c32eceeade72d3956a3a11abe410f6 (diff) | |
| parent | 9265b5610e17c3f0ee8b877c2cf14ebe659055fc (diff) | |
Merge "NetworkAgent: Send primitive integer in score" am: 7e83b79010 am: c039ad203e am: bed7695b13
am: 9265b5610e
Change-Id: I31c885ca25afe6724f7549bba2cd3ae99b1477af
| -rw-r--r-- | core/java/android/net/NetworkAgent.java | 2 | ||||
| -rw-r--r-- | services/core/java/com/android/server/ConnectivityService.java | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/core/java/android/net/NetworkAgent.java b/core/java/android/net/NetworkAgent.java index 52a2354840c9..081d8d1290ac 100644 --- a/core/java/android/net/NetworkAgent.java +++ b/core/java/android/net/NetworkAgent.java @@ -372,7 +372,7 @@ public abstract class NetworkAgent extends Handler { if (score < 0) { throw new IllegalArgumentException("Score must be >= 0"); } - queueOrSendMessage(EVENT_NETWORK_SCORE_CHANGED, new Integer(score)); + queueOrSendMessage(EVENT_NETWORK_SCORE_CHANGED, score, 0); } /** diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 6b3f8f8eb216..914404be887f 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -2194,8 +2194,7 @@ public class ConnectivityService extends IConnectivityManager.Stub break; } case NetworkAgent.EVENT_NETWORK_SCORE_CHANGED: { - Integer score = (Integer) msg.obj; - if (score != null) updateNetworkScore(nai, score.intValue()); + updateNetworkScore(nai, msg.arg1); break; } case NetworkAgent.EVENT_SET_EXPLICITLY_SELECTED: { |