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

Commit 0f40c023 authored by Chiachang Wang's avatar Chiachang Wang
Browse files

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: I8240b1c74b53d5d66850d9a3ec7d5e5c11558e6a
Merged-In: I2fb674e0d7da0b11ba70177853fd6259bce372a3
parent ace5a908

src/com/android/settings/wifi/WifiConfigController.java

+4 −3
Original line number Diff line number Diff line
@@ -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;
@@ -69,6 +69,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;
@@ -898,7 +899,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;

        }
@@ -934,7 +935,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());

src/com/android/settings/wifi/WifiConfigController2.java

+4 −3
Original line number Diff line number Diff line
@@ -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;
@@ -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;
@@ -879,7 +880,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;

        }
@@ -915,7 +916,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());

src/com/android/settings/wifi/details/WifiDetailPreferenceController.java

+2 −2
Original line number Diff line number Diff line
@@ -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;
@@ -61,6 +60,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;
@@ -932,7 +932,7 @@ public class WifiDetailPreferenceController extends AbstractPreferenceController 
        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;

        }

src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java

+2 −2
Original line number Diff line number Diff line
@@ -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;
@@ -869,7 +869,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;

        }