Merge "Add NetworkStack networking deps to SystemApi"

import android.net.IpPrefix;

import android.net.LinkAddress;

import android.net.LinkProperties;

import android.net.Network;

import android.net.ProvisioningConfigurationParcelable;

import android.net.ProxyInfo;

import android.net.ProxyInfoParcelable;

        // mDhcpResults is never shared with any other owner so we don't have

        // to worry about concurrent modification.

        if (mDhcpResults != null) {

            for (RouteInfo route : mDhcpResults.getRoutes(mInterfaceName)) {

            final List<RouteInfo> routes =

                    mDhcpResults.toStaticIpConfiguration().getRoutes(mInterfaceName);

            for (RouteInfo route : routes) {

                newLp.addRoute(route);

            }

            addAllReachableDnsServers(newLp, mDhcpResults.dnsServers);

import java.net.UnknownHostException;

import java.util.ArrayList;

import java.util.Arrays;

import java.util.Collection;

import java.util.Collections;

import java.util.LinkedHashMap;

import java.util.List;

                return null;

            }

            return CaptivePortalProbeSpec.parseCaptivePortalProbeSpecs(settingsValue);

            final Collection<CaptivePortalProbeSpec> specs =

                    CaptivePortalProbeSpec.parseCaptivePortalProbeSpecs(settingsValue);

            final CaptivePortalProbeSpec[] specsArray = new CaptivePortalProbeSpec[specs.size()];

            return specs.toArray(specsArray);

        } catch (Exception e) {

            // Don't let a misconfiguration bootloop the system.

            Log.e(TAG, "Error parsing configured fallback probe specs", e);