Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a60c6eab authored by Hugo Benichi's avatar Hugo Benichi
Browse files

Really allow NetworkAgent immutable updates to NetworkCapabilities 

This patch completes commit bae105a5 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
parent b7cbb2fe

services/core/java/com/android/server/ConnectivityService.java

+2 −2
Original line number Diff line number Diff line
@@ -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.