Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove hidden LinkProperties methods accesses" am: eed88a705d am: 65e6be618f

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

Change-Id: Ib99ec3f77247d38f7e7c47898aa3e27ad2ed9a93
This commit is contained in:
Paul Hu
2021-03-19 06:44:34 +00:00
committed by Automerger Merge Worker
parent 37e8ecdb9a 65e6be618f
commit 9c7ea4db8a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/SettingsLib/src/com/android/settingslib/deviceinfo/AbstractIpAddressPreferenceController.java
View File

@@ -18,6 +18,7 @@ package com.android.settingslib.deviceinfo;
import android.content.Context; import android.content.Context;
import android.net.ConnectivityManager; import android.net.ConnectivityManager;
import android.net.LinkAddress;
import android.net.LinkProperties; import android.net.LinkProperties;
import android.net.wifi.WifiManager; import android.net.wifi.WifiManager;
@@ -28,7 +29,6 @@ import androidx.preference.PreferenceScreen;
import com.android.settingslib.R; import com.android.settingslib.R;
import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.Lifecycle;
import java.net.InetAddress;
import java.util.Iterator; import java.util.Iterator;
/** /**
@@ -93,19 +93,19 @@ public abstract class AbstractIpAddressPreferenceController
* @return the formatted and newline-separated IP addresses, or null if none. * @return the formatted and newline-separated IP addresses, or null if none.
*/ */
private static String getDefaultIpAddresses(ConnectivityManager cm) { private static String getDefaultIpAddresses(ConnectivityManager cm) {
LinkProperties prop = cm.getActiveLinkProperties(); LinkProperties prop = cm.getLinkProperties(cm.getActiveNetwork());
return formatIpAddresses(prop); return formatIpAddresses(prop);
} }
private static String formatIpAddresses(LinkProperties prop) { private static String formatIpAddresses(LinkProperties prop) {
if (prop == null) return null; 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 there are no entries, return null
if (!iter.hasNext()) return null; if (!iter.hasNext()) return null;
// Concatenate all available addresses, newline separated // Concatenate all available addresses, newline separated
StringBuilder addresses = new StringBuilder(); StringBuilder addresses = new StringBuilder();
while (iter.hasNext()) { while (iter.hasNext()) {
addresses.append(iter.next().getHostAddress()); addresses.append(iter.next().getAddress().getHostAddress());
if (iter.hasNext()) addresses.append("\n"); if (iter.hasNext()) addresses.append("\n");
} }
return addresses.toString(); return addresses.toString();