Merge "[NS A11] Small refactor"

    private void rematchNetworkAndRequests(NetworkAgentInfo newNetwork, long now) {

        ensureRunningOnConnectivityServiceThread();

        if (!newNetwork.everConnected) return;

        boolean keep = newNetwork.isVPN();

        boolean isNewDefault = false;

        NetworkAgentInfo oldDefaultNetwork = null;

                    Slog.wtf(TAG, "BUG: " + newSatisfier.name() + " already has " + nri.request);

                }

                addedRequests.add(nri);

                keep = true;

                // Tell NetworkFactories about the new score, so they can stop

                // trying to connect if they know they cannot match it.

                // TODO - this could get expensive if we have a lot of requests for this

            notifyLockdownVpn(newNetwork);

        }

        if (keep) {

        if (reassignedRequests.containsValue(newNetwork) || newNetwork.isVPN()) {

            // Notify battery stats service about this network, both the normal

            // interface and any stacked links.

            // TODO: Avoid redoing this; this must only be done once when a network comes online.