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

Commit 65c57011 authored by Chiachang Wang's avatar Chiachang Wang Committed by Android (Google) Code Review
Browse files

Merge "Replace subnet mask calculation to Inet4AddressUtils" into sc-dev

parents 3ed989b2 17a8eaca
Loading
Loading
Loading
Loading
+3 −6
Original line number Original line Diff line number Diff line
@@ -63,7 +63,7 @@ import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceScreen;
import androidx.preference.PreferenceScreen;


import com.android.net.module.util.NetUtils;
import com.android.net.module.util.Inet4AddressUtils;
import com.android.settings.R;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.Utils;
import com.android.settings.core.FeatureFlags;
import com.android.settings.core.FeatureFlags;
@@ -99,7 +99,6 @@ import com.android.wifitrackerlib.WifiEntry.WifiEntryCallback;
import java.net.Inet4Address;
import java.net.Inet4Address;
import java.net.Inet6Address;
import java.net.Inet6Address;
import java.net.InetAddress;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.time.Duration;
import java.time.Duration;
import java.time.Instant;
import java.time.Instant;
import java.time.ZonedDateTime;
import java.time.ZonedDateTime;
@@ -873,10 +872,8 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle


    private static String ipv4PrefixLengthToSubnetMask(int prefixLength) {
    private static String ipv4PrefixLengthToSubnetMask(int prefixLength) {
        try {
        try {
            InetAddress all = InetAddress.getByAddress(
            return Inet4AddressUtils.getPrefixMaskAsInet4Address(prefixLength).getHostAddress();
                    new byte[]{(byte) 255, (byte) 255, (byte) 255, (byte) 255});
        } catch (IllegalArgumentException e) {
            return NetUtils.getNetworkPart(all, prefixLength).getHostAddress();
        } catch (UnknownHostException e) {
            return null;
            return null;
        }
        }
    }
    }