diff options
| author | Chiachang Wang <chiachangwang@google.com> | 2021-02-20 00:24:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2021-02-20 00:24:13 +0000 |
| commit | 0754b6c0f30503f618ada017a9d903ce2143ef0e (patch) | |
| tree | 3088185318be81c04b62408d030cb18c62f7a1fe | |
| parent | 7db232e1ce667aa08ef99aa6c52cadcf98d18aa7 (diff) | |
| parent | 7e1b226066725b7a23e22227e4f9e1fcf75df1ab (diff) | |
| download | wifi-0754b6c0f30503f618ada017a9d903ce2143ef0e.tar.gz | |
Merge "Replace network utils method"
| -rw-r--r-- | libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java index 675c80d0a..09a2a3ffe 100644 --- a/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java +++ b/libs/WifiTrackerLib/src/com/android/wifitrackerlib/WifiEntry.java @@ -26,7 +26,6 @@ import android.net.LinkAddress; import android.net.LinkProperties; import android.net.NetworkCapabilities; import android.net.NetworkInfo; -import android.net.NetworkUtils; import android.net.RouteInfo; import android.net.wifi.WifiConfiguration; import android.net.wifi.WifiInfo; @@ -42,6 +41,8 @@ import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import androidx.annotation.WorkerThread; +import com.android.net.module.util.NetUtils; + import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.net.Inet4Address; @@ -689,7 +690,7 @@ public abstract class WifiEntry implements Comparable<WifiEntry> { try { InetAddress all = InetAddress.getByAddress( new byte[]{(byte) 255, (byte) 255, (byte) 255, (byte) 255}); - mConnectedInfo.subnetMask = NetworkUtils.getNetworkPart( + mConnectedInfo.subnetMask = NetUtils.getNetworkPart( all, addr.getPrefixLength()).getHostAddress(); } catch (UnknownHostException e) { // Leave subnet null; |