PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia3b5e175314931e052466c88abc79d73966dea1f
This commit is contained in:
Chiachang Wang
2021-02-23 05:57:50 +00:00
committed by Automerger Merge Worker
parent f304f02e14 65c570117e
commit dad8f09b3b
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/wifi/details2/WifiDetailPreferenceController2.java
View File

@@ -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;
} }
} }