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

Commit 408db329 authored by Chalard Jean's avatar Chalard Jean
Browse files

[NS A42] Move writing to the reassignment to the computation

...instead of the side effect loop. This is a no-op refactoring.

Test: ConnectivityServiceTest
Change-Id: I8308d55eaff080efb22a7a43142492545e626cf5
parent a15fd130
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -6591,9 +6591,13 @@ public class ConnectivityService extends IConnectivityManager.Stub
                }
                if (currentNetwork == null || currentNetwork.getCurrentScore() < score) {
                    reassignedRequests.put(nri, newNetwork);
                    changes.addRequestReassignment(new NetworkReassignment.RequestReassignment(
                            nri, currentNetwork, newNetwork));
                }
            } else if (newNetwork == currentNetwork) {
                reassignedRequests.put(nri, null);
                changes.addRequestReassignment(new NetworkReassignment.RequestReassignment(
                        nri, currentNetwork, null));
            }
        }
        return reassignedRequests;
@@ -6634,8 +6638,6 @@ public class ConnectivityService extends IConnectivityManager.Stub
            final NetworkRequestInfo nri = entry.getKey();
            final NetworkAgentInfo previousSatisfier = nri.mSatisfier;
            final NetworkAgentInfo newSatisfier = entry.getValue();
            changes.addRequestReassignment(new NetworkReassignment.RequestReassignment(
                    nri, previousSatisfier, newSatisfier));
            updateSatisfiersForRematchRequest(nri, previousSatisfier, newSatisfier, now);
        }
    }