Merge "Remove hidden LinkProperties methods accesses" am: eed88a70

import android.content.Context;

import android.net.ConnectivityManager;

import android.net.LinkAddress;

import android.net.LinkProperties;

import android.net.wifi.WifiManager;

import com.android.settingslib.R;

import com.android.settingslib.core.lifecycle.Lifecycle;

import java.net.InetAddress;

import java.util.Iterator;

/**

     * @return the formatted and newline-separated IP addresses, or null if none.

     */

    private static String getDefaultIpAddresses(ConnectivityManager cm) {

        LinkProperties prop = cm.getActiveLinkProperties();

        LinkProperties prop = cm.getLinkProperties(cm.getActiveNetwork());

        return formatIpAddresses(prop);

    }

    private static String formatIpAddresses(LinkProperties prop) {

        if (prop == null) return null;

        Iterator<InetAddress> iter = prop.getAllAddresses().iterator();

        Iterator<LinkAddress> iter = prop.getAllLinkAddresses().iterator();

        // If there are no entries, return null

        if (!iter.hasNext()) return null;

        // Concatenate all available addresses, newline separated

        StringBuilder addresses = new StringBuilder();

        while (iter.hasNext()) {

            addresses.append(iter.next().getHostAddress());

            addresses.append(iter.next().getAddress().getHostAddress());

            if (iter.hasNext()) addresses.append("\n");

        }

        return addresses.toString();