From 7afbea0e6e08512aec1149bde738daa46b6b16fc Mon Sep 17 00:00:00 2001 From: Hugo Benichi Date: Fri, 18 Aug 2017 14:41:22 +0900 Subject: [PATCH] Really allow NetworkAgent immutable updates to NetworkCapabilities This patch completes commit 1ebf219ed96fa6e101c811a745b352791c6ae100 to really allow updates of immutable capabilities to NetworkCapabilities of NetworkAgents by using satisfiedByImmutableNetworkCapabilities instead satisfiedByNetworkCapabilities. Bug: 64125969 Test: runtest frameworks-net Change-Id: I9beeb623792f0ee31abcd4ba9d0ba2451304fb2e --- .../core/java/com/android/server/ConnectivityService.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/core/java/com/android/server/ConnectivityService.java b/services/core/java/com/android/server/ConnectivityService.java index 0babbc898f..33e4f5ca65 100644 --- a/services/core/java/com/android/server/ConnectivityService.java +++ b/services/core/java/com/android/server/ConnectivityService.java @@ -4703,8 +4703,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.