am 0bac7fa7: am 3b9ce37b: Fix build break.

* commit '0bac7fa791ced8e1e1ab67eca72c48be1b19eded':
  Fix build break.
This commit is contained in:
Paul Jensen
2015-07-10 17:10:40 +00:00
committed by Android Git Automerger

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 :