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

Commit 1ca746f6 authored by Paul Hu's avatar Paul Hu Committed by Automerger Merge Worker
Browse files

Merge "Remove hidden LinkProperties methods accesses" am: eed88a70 am:...

Merge "Remove hidden LinkProperties  methods accesses" am: eed88a70 am: 65e6be61 am: 9c7ea4db am: a4f25326

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1645287

Change-Id: Ic8dd9cd1a0e3326f57087c9c6b11c5ee96bb392f
parents b502f7e5 a4f25326
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.settingslib.deviceinfo;

import android.content.Context;
import android.net.ConnectivityManager;
import android.net.LinkAddress;
import android.net.LinkProperties;
import android.net.wifi.WifiManager;

@@ -28,7 +29,6 @@ import androidx.preference.PreferenceScreen;
import com.android.settingslib.R;
import com.android.settingslib.core.lifecycle.Lifecycle;

import java.net.InetAddress;
import java.util.Iterator;

/**
@@ -93,19 +93,19 @@ public abstract class AbstractIpAddressPreferenceController
     * @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();