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

Fix build break.

Browse Source 
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 d2a43f9 and 7fb8adc.

Change-Id: I8fd32e1a187236a65c1b7c0ecdf17b817d108fd0
This commit is contained in:
Paul Jensen
2015-07-10 12:19:38 -04:00
parent 4387ed3583
commit 8079795a7b
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4488,8 +4488,7 @@ public class ConnectivityService extends IConnectivityManager.Stub
state == NetworkInfo.State.SUSPENDED) { state == NetworkInfo.State.SUSPENDED) {
// going into or coming out of SUSPEND: rescore and notify // going into or coming out of SUSPEND: rescore and notify
if (networkAgent.getCurrentScore() != oldScore) { if (networkAgent.getCurrentScore() != oldScore) {
rematchAllNetworksAndRequests(networkAgent, oldScore, rematchAllNetworksAndRequests(networkAgent, oldScore);
NascentState.NOT_JUST_VALIDATED);
} }
notifyNetworkCallbacks(networkAgent, (state == NetworkInfo.State.SUSPENDED ? notifyNetworkCallbacks(networkAgent, (state == NetworkInfo.State.SUSPENDED ?
ConnectivityManager.CALLBACK_SUSPENDED : ConnectivityManager.CALLBACK_SUSPENDED :