From a2957edb0cf076626e2500b01e74f32c5b5bef66 Mon Sep 17 00:00:00 2001 From: Lorenzo Colitti Date: Wed, 16 Sep 2015 11:00:43 +0900 Subject: [PATCH] Unbreak build, bring ConnectivityService in sync with mnc-dr-dev The version of ConnectivityService.java in mnc-vt-dev doesn't compile due to the presence of two similar-but-not-identical code blocks in handleRegisterNetworkAgent. The history here is a a little convoluted - this code was originally merged into mnc-vt-dev, then cherry-picked into dr-dev, and from there automerged into mnc-vt-dev, causing conflicts. This latest breakage is likely due to the automerged not detecting a conflict because the code block was subtly different. Attempt to fix this once and for all by making the mnc-vt-dev version of the file identical to the mnc-dr-dev version. Change-Id: I270739b0be6f6358045700494a1b0f25f0b365a3 --- .../java/com/android/server/ConnectivityService.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index aae7234eb4..6190a5ab35 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -2277,13 +2277,6 @@ public class ConnectivityService extends IConnectivityManager.Stub } } rematchAllNetworksAndRequests(null, 0); - if (!nri.isRequest && nri.request.networkCapabilities.hasSignalStrength()) { - for (NetworkAgentInfo network : mNetworkAgentInfos.values()) { - if (network.satisfiesImmutableCapabilitiesOf(nri.request)) { - updateSignalStrengthThresholds(network); - } - } - } if (nri.isRequest && mNetworkForRequestId.get(nri.request.requestId) == null) { sendUpdatedScoreToFactories(nri.request, 0); } @@ -4147,9 +4140,6 @@ public class ConnectivityService extends IConnectivityManager.Stub nai.networkCapabilities = networkCapabilities; } rematchAllNetworksAndRequests(nai, oldScore); - // TODO: reduce the number of callbacks where possible. For example, only send signal - // strength changes if the NetworkRequest used to register the callback specified a - // signalStrength. notifyNetworkCallbacks(nai, ConnectivityManager.CALLBACK_CAP_CHANGED); } }