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

Commit 322a336e authored by Hugo Benichi's avatar Hugo Benichi Committed by Android (Google) Code Review
Browse files

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

parents eb11304b 80e8e0f8

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

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