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

Commit dad8f09b authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Replace subnet mask calculation to Inet4AddressUtils" into sc-dev am: 65c57011 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13668406

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia3b5e175314931e052466c88abc79d73966dea1f
parents f304f02e 65c57011

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

+3 −6
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ import androidx.preference.PreferenceCategory; 
import androidx.preference.PreferenceFragmentCompat;

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.Utils;

import com.android.settings.core.FeatureFlags;
@@ -99,7 +99,6 @@ import com.android.wifitrackerlib.WifiEntry.WifiEntryCallback; 
import java.net.Inet4Address;

import java.net.Inet6Address;

import java.net.InetAddress;

import java.net.UnknownHostException;

import java.time.Duration;

import java.time.Instant;

import java.time.ZonedDateTime;
@@ -873,10 +872,8 @@ public class WifiDetailPreferenceController2 extends AbstractPreferenceControlle 


    private static String ipv4PrefixLengthToSubnetMask(int prefixLength) {

        try {

            InetAddress all = InetAddress.getByAddress(

                    new byte[]{(byte) 255, (byte) 255, (byte) 255, (byte) 255});

            return NetUtils.getNetworkPart(all, prefixLength).getHostAddress();

        } catch (UnknownHostException e) {

            return Inet4AddressUtils.getPrefixMaskAsInet4Address(prefixLength).getHostAddress();

        } catch (IllegalArgumentException e) {

            return null;

        }

    }