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

Merge "Really allow NetworkAgent immutable updates to NetworkCapabilities" into oc-mr1-dev

Browse Source
This commit is contained in:
Hugo Benichi
2017-08-21 03:24:06 +00:00
committed by Android (Google) Code Review
parent 2d10195128 b319377255
commit 39b6912019
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4583,8 +4583,8 @@ public class ConnectivityService extends IConnectivityManager.Stub
private void updateCapabilities(
int oldScore, NetworkAgentInfo nai, NetworkCapabilities networkCapabilities) {
// Once a NetworkAgent is connected, complain if some immutable capabilities are removed.
if (nai.everConnected &&
!nai.networkCapabilities.satisfiedByNetworkCapabilities(networkCapabilities)) {
if (nai.everConnected && !nai.networkCapabilities.satisfiedByImmutableNetworkCapabilities(
networkCapabilities)) {
// TODO: consider not complaining when a network agent degrade its capabilities if this
// does not cause any request (that is not a listen) currently matching that agent to
// stop being matched by the updated agent.