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

Commit beae6211 authored by Hugo Benichi's avatar Hugo Benichi Committed by android-build-merger
Browse files

Merge "Really allow NetworkAgent immutable updates to NetworkCapabilities" am: cb3c24e3 

am: 461f4eb0

Change-Id: Id352fdb6da21a2150d3e8d062d7eba11878f6919
parents d4733938 461f4eb0

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

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