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

Unbreak build, bring ConnectivityService in sync with mnc-dr-dev

Browse Source 
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
This commit is contained in:
Lorenzo Colitti
2015-09-16 11:00:43 +09:00
parent 26b947cf10
commit a2957edb0c
1 changed files with 0 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2277,13 +2277,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
} }
} }
rematchAllNetworksAndRequests(null, 0); 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) { if (nri.isRequest && mNetworkForRequestId.get(nri.request.requestId) == null) {
sendUpdatedScoreToFactories(nri.request, 0); sendUpdatedScoreToFactories(nri.request, 0);
} }
@@ -4147,9 +4140,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
nai.networkCapabilities = networkCapabilities; nai.networkCapabilities = networkCapabilities;
} }
rematchAllNetworksAndRequests(nai, oldScore); 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); notifyNetworkCallbacks(nai, ConnectivityManager.CALLBACK_CAP_CHANGED);
} }
} }