diff options
| author | 2015-07-10 12:19:38 -0400 | |
|---|---|---|
| committer | 2015-07-10 12:29:23 -0400 | |
| commit | 3b9ce37b51dcc7729489701d4e797fe91f2ef559 (patch) | |
| tree | 0353a67552d6e9ad9b3468e95d8318bb1b210247 | |
| parent | bbce221eecdf54317dd0655e5f3507b82db4bfc1 (diff) | |
Fix build break.
Automatic merge commit caused breakage due to someone else's
intervening change adding a call site of a function whose last
parameter I removed. Function in question is
ConnectivityService.rematchAllNetworksAndRequests.
Changes that merged badly are 85cf78e and 8d48252.
Change-Id: I8fd32e1a187236a65c1b7c0ecdf17b817d108fd0
| -rw-r--r-- | services/core/java/com/android/server/ConnectivityService.java | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 3a184c7d18ae..2075c07edb44 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -4488,8 +4488,7 @@ public class ConnectivityService extends IConnectivityManager.Stub state == NetworkInfo.State.SUSPENDED) { // going into or coming out of SUSPEND: rescore and notify if (networkAgent.getCurrentScore() != oldScore) { - rematchAllNetworksAndRequests(networkAgent, oldScore, - NascentState.NOT_JUST_VALIDATED); + rematchAllNetworksAndRequests(networkAgent, oldScore); } notifyNetworkCallbacks(networkAgent, (state == NetworkInfo.State.SUSPENDED ? ConnectivityManager.CALLBACK_SUSPENDED : |