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

Commit 7f014e5c authored by Chalard Jean's avatar Chalard Jean
Browse files

[NS A05] Move some side effects out of the network decision loop 

This moves the side effects done by the decision loop when a
network stops satisfying a request to outside the decision loop.

Bug: 113554781
Test: ConnectivityServiceTest
Change-Id: I7b7594250d5c04362c699e065d30a1181effed09
parent 8dcbaa5c

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

+10 −1
Original line number Diff line number Diff line
@@ -6407,6 +6407,14 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                }

            } else if (newNetwork.isSatisfyingRequest(nri.request.requestId)) {

                reassignedRequests.put(nri, null);

            }

        }



        for (final Map.Entry<NetworkRequestInfo, NetworkAgentInfo> entry :

                reassignedRequests.entrySet()) {

            final NetworkRequestInfo nri = entry.getKey();

            final NetworkAgentInfo previousSatisfier = nri.mSatisfier;

            if (entry.getValue() == null) {

                // If "newNetwork" is listed as satisfying "nri" but no longer satisfies "nri",

                // mark it as no longer satisfying "nri".  Because networks are processed by

                // rematchAllNetworksAndRequests() in descending score order, "currentNetwork" will
@@ -6419,7 +6427,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                            " request " + nri.request.requestId);

                }

                newNetwork.removeRequest(nri.request.requestId);

                if (currentNetwork == newNetwork) {

                if (previousSatisfier == newNetwork) {

                    nri.mSatisfier = null;

                    if (isDefaultRequest(nri)) mDefaultNetworkNai = null;

                    sendUpdatedScoreToFactories(nri.request, null);
@@ -6438,6 +6446,7 @@ public class ConnectivityService extends IConnectivityManager.Stub 
                callCallbackForRequest(nri, newNetwork, ConnectivityManager.CALLBACK_LOST, 0);

            }

        }



        if (isNewDefault) {

            updateDataActivityTracking(newNetwork, oldDefaultNetwork);

            // Notify system services that this network is up.