Merge "Notify NetworkStatsService of roaming status changes."

import static android.net.NetworkPolicyManager.RULE_REJECT_METERED;

import android.annotation.Nullable;

import android.app.AlarmManager;

import android.app.BroadcastOptions;

import android.app.Notification;

import android.app.NotificationManager;

import android.os.Process;

import android.os.RemoteException;

import android.os.ResultReceiver;

import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.os.UserManager;

import com.android.internal.net.VpnConfig;

import com.android.internal.net.VpnInfo;

import com.android.internal.net.VpnProfile;

import com.android.internal.telephony.DctConstants;

import com.android.internal.util.AsyncChannel;

import com.android.internal.util.IndentingPrintWriter;

import com.android.internal.util.XmlUtils;

import java.util.HashSet;

import java.util.SortedSet;

import java.util.TreeSet;

import java.util.Iterator;

import java.util.List;

import java.util.Map;

import java.util.Objects;

import java.util.concurrent.atomic.AtomicInteger;

/**

 * @hide

            if (wasDefault) {

                mDefaultInetConditionPublished = 0;

            }

            notifyIfacesChanged();

            notifyIfacesChangedForNetworkStats();

            // TODO - we shouldn't send CALLBACK_LOST to requests that can be satisfied

            // by other networks that are already connected. Perhaps that can be done by

            // sending all CALLBACK_LOST messages (for requests, not listens) at the end

        }

        // TODO - move this check to cover the whole function

        if (!Objects.equals(newLp, oldLp)) {

            notifyIfacesChanged();

            notifyIfacesChangedForNetworkStats();

            notifyNetworkCallbacks(networkAgent, ConnectivityManager.CALLBACK_IP_CHANGED);

        }

        notifyLockdownVpn(networkAgent);

        if (oldInfo != null && oldInfo.getState() == state) {

            if (VDBG) log("ignoring duplicate network state non-change");

            if (oldInfo.isRoaming() != newInfo.isRoaming()) {

                if (VDBG) log("roaming status changed, notifying NetworkStatsService");

                notifyIfacesChangedForNetworkStats();

            } else if (VDBG) log("ignoring duplicate network state non-change");

            // In either case, no further work should be needed.

            return;

        }

        if (DBG) {

            }

            networkAgent.created = true;

            updateLinkProperties(networkAgent, null);

            notifyIfacesChanged();

            notifyIfacesChangedForNetworkStats();

            networkAgent.networkMonitor.sendMessage(NetworkMonitor.CMD_NETWORK_CONNECTED);

            scheduleUnvalidatedPrompt(networkAgent);

    }

    /**

     * Notify other system services that set of active ifaces has changed.

     * Notify NetworkStatsService that the set of active ifaces has changed, or that one of the

     * properties tracked by NetworkStatsService on an active iface has changed.

     */

    private void notifyIfacesChanged() {

    private void notifyIfacesChangedForNetworkStats() {

        try {

            mStatsService.forceUpdateIfaces();

        } catch (Exception ignored) {

            success = mVpns.get(user).setUnderlyingNetworks(networks);

        }

        if (success) {

            notifyIfacesChanged();

            notifyIfacesChangedForNetworkStats();

        }

        return success;

    }