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

Commit c97af5b4 authored by Chalard Jean's avatar Chalard Jean
Browse files

[NS A40] Read current reassignment state instead of global state 

The reassignment state has the future value, but is transient
instead of global. With this, the reassignment loop does not
read from global state any more, so it's not affected by the
side effects from the loop.

This means future patches will be able to move the side effects
out of the computation.

Test: atest ConnectivityServiceTest
Change-Id: I43499f19730bcd94b691cfea83aa1ca1d3de75db
parent e3287b71

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

+6 −2
Original line number Diff line number Diff line
@@ -6511,6 +6511,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
    }



    private ArrayMap<NetworkRequestInfo, NetworkAgentInfo> computeRequestReassignmentForNetwork(

            @NonNull final NetworkReassignment changes,

            @NonNull final NetworkAgentInfo newNetwork) {

        final int score = newNetwork.getCurrentScore();

        final ArrayMap<NetworkRequestInfo, NetworkAgentInfo> reassignedRequests = new ArrayMap<>();
@@ -6521,7 +6522,10 @@ public class ConnectivityService extends IConnectivityManager.Stub 
            // requests or not, and doesn't affect the network's score.

            if (nri.request.isListen()) continue;



            final NetworkAgentInfo currentNetwork = nri.mSatisfier;

            // The reassignment has been seeded with the initial assignment, therefore

            // getReassignment can't be null and mNewNetwork is only null if there was no

            // satisfier in the first place or there was an explicit reassignment to null.

            final NetworkAgentInfo currentNetwork = changes.getReassignment(nri).mNewNetwork;

            final boolean satisfies = newNetwork.satisfies(nri.request);

            if (newNetwork == currentNetwork && satisfies) continue;
@@ -6571,7 +6575,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
        if (VDBG || DDBG) log("rematching " + newNetwork.name());



        final ArrayMap<NetworkRequestInfo, NetworkAgentInfo> reassignedRequests =

                computeRequestReassignmentForNetwork(newNetwork);

                computeRequestReassignmentForNetwork(changes, newNetwork);



        // Find and migrate to this Network any NetworkRequests for

        // which this network is now the best.