From 384b88e3fb45dad3082efd391e0177e900b07a2d Mon Sep 17 00:00:00 2001 From: Chiachang Wang Date: Thu, 4 Feb 2021 10:01:37 +0800 Subject: [PATCH] Replace NetworkUtils methods NetworkUtils is moved to connectivity mainline module which is not accessible for module outside. getNetworkPart() method is used by wifi lib and Settings but no usage inside the module, so move the method to framework lib to share with wifi lib and Settings. Also, NetworkUtils.numericToInetAddress() method is also hidden and deprecated. It should be replaced by InetAddresses.parseNumericAddress(). Update the corresponding usage to refer to these methods. Bug: 172183305 Test: atest SettingsRoboTests Change-Id: I2fb674e0d7da0b11ba70177853fd6259bce372a3 --- src/com/android/settings/wifi/WifiConfigController.java | 7 ++++--- src/com/android/settings/wifi/WifiConfigController2.java | 7 ++++--- .../wifi/details2/WifiDetailPreferenceController2.java | 4 ++-- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/com/android/settings/wifi/WifiConfigController.java b/src/com/android/settings/wifi/WifiConfigController.java index 65e45b76870..3c95e910196 100644 --- a/src/com/android/settings/wifi/WifiConfigController.java +++ b/src/com/android/settings/wifi/WifiConfigController.java @@ -18,12 +18,12 @@ package com.android.settings.wifi; import android.content.Context; import android.content.res.Resources; +import android.net.InetAddresses; import android.net.IpConfiguration; import android.net.IpConfiguration.IpAssignment; import android.net.IpConfiguration.ProxySettings; import android.net.LinkAddress; import android.net.NetworkInfo.DetailedState; -import android.net.NetworkUtils; import android.net.ProxyInfo; import android.net.StaticIpConfiguration; import android.net.Uri; @@ -67,6 +67,7 @@ import android.widget.TextView; import androidx.annotation.VisibleForTesting; +import com.android.net.module.util.NetUtils; import com.android.net.module.util.ProxyUtils; import com.android.settings.ProxySelector; import com.android.settings.R; @@ -878,7 +879,7 @@ public class WifiConfigController implements TextWatcher, private Inet4Address getIPv4Address(String text) { try { - return (Inet4Address) NetworkUtils.numericToInetAddress(text); + return (Inet4Address) InetAddresses.parseNumericAddress(text); } catch (IllegalArgumentException | ClassCastException e) { return null; } @@ -914,7 +915,7 @@ public class WifiConfigController implements TextWatcher, if (TextUtils.isEmpty(gateway)) { try { //Extract a default gateway from IP address - InetAddress netPart = NetworkUtils.getNetworkPart(inetAddr, networkPrefixLength); + InetAddress netPart = NetUtils.getNetworkPart(inetAddr, networkPrefixLength); byte[] addr = netPart.getAddress(); addr[addr.length - 1] = 1; mGatewayView.setText(InetAddress.getByAddress(addr).getHostAddress()); diff --git a/src/com/android/settings/wifi/WifiConfigController2.java b/src/com/android/settings/wifi/WifiConfigController2.java index 49f1b21aeab..5933d6f84fb 100644 --- a/src/com/android/settings/wifi/WifiConfigController2.java +++ b/src/com/android/settings/wifi/WifiConfigController2.java @@ -18,11 +18,11 @@ package com.android.settings.wifi; import android.content.Context; import android.content.res.Resources; +import android.net.InetAddresses; import android.net.IpConfiguration; import android.net.IpConfiguration.IpAssignment; import android.net.IpConfiguration.ProxySettings; import android.net.LinkAddress; -import android.net.NetworkUtils; import android.net.ProxyInfo; import android.net.StaticIpConfiguration; import android.net.Uri; @@ -65,6 +65,7 @@ import android.widget.TextView; import androidx.annotation.VisibleForTesting; +import com.android.net.module.util.NetUtils; import com.android.net.module.util.ProxyUtils; import com.android.settings.ProxySelector; import com.android.settings.R; @@ -840,7 +841,7 @@ public class WifiConfigController2 implements TextWatcher, private Inet4Address getIPv4Address(String text) { try { - return (Inet4Address) NetworkUtils.numericToInetAddress(text); + return (Inet4Address) InetAddresses.parseNumericAddress(text); } catch (IllegalArgumentException | ClassCastException e) { return null; } @@ -876,7 +877,7 @@ public class WifiConfigController2 implements TextWatcher, if (TextUtils.isEmpty(gateway)) { try { //Extract a default gateway from IP address - InetAddress netPart = NetworkUtils.getNetworkPart(inetAddr, networkPrefixLength); + InetAddress netPart = NetUtils.getNetworkPart(inetAddr, networkPrefixLength); byte[] addr = netPart.getAddress(); addr[addr.length - 1] = 1; mGatewayView.setText(InetAddress.getByAddress(addr).getHostAddress()); diff --git a/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java b/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java index c9cddcc5590..0989939621c 100644 --- a/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java +++ b/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java @@ -40,7 +40,6 @@ import android.net.Network; import android.net.NetworkCapabilities; import android.net.NetworkInfo; import android.net.NetworkRequest; -import android.net.NetworkUtils; import android.net.RouteInfo; import android.net.Uri; import android.net.wifi.WifiConfiguration; @@ -64,6 +63,7 @@ import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceFragmentCompat; import androidx.preference.PreferenceScreen; +import com.android.net.module.util.NetUtils; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.FeatureFlags; @@ -875,7 +875,7 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle try { InetAddress all = InetAddress.getByAddress( new byte[]{(byte) 255, (byte) 255, (byte) 255, (byte) 255}); - return NetworkUtils.getNetworkPart(all, prefixLength).getHostAddress(); + return NetUtils.getNetworkPart(all, prefixLength).getHostAddress(); } catch (UnknownHostException e) { return null; }