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

Commit ded7e058 authored by Chiachang Wang's avatar Chiachang Wang
Browse files

Remove hidden LinkProperties methods accesses 

This commit resolves the hidden methods accesses for
LinkProperties in Setting libs. Replace them with equivalent
methods.

Bug: 172183305
Test: m
Change-Id: I66592aa9e0e5982c9fae51de3587c1e759f545ef
parent 7af6a2e9

packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractIpAddressPreferenceController.java

+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();