diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2020-06-19 00:49:29 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-06-19 00:49:29 +0000 |
| commit | 6555756e9000a8f137933973b8652593d0e081bb (patch) | |
| tree | d82754382910dc6dc5359b5860a84cbb07674b02 /wifi | |
| parent | 853ee379371ffa2e9aadd8dc3a96c4ef245e3924 (diff) | |
| parent | eee629f4c722c43f29f1e287b5b1d9a8d9282e2c (diff) | |
Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev
Diffstat (limited to 'wifi')
| -rw-r--r-- | wifi/jarjar-rules.txt | 3 | ||||
| -rw-r--r-- | wifi/java/android/net/wifi/WifiInfo.java | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/wifi/jarjar-rules.txt b/wifi/jarjar-rules.txt index f0555e6ec93e..e253ae25659e 100644 --- a/wifi/jarjar-rules.txt +++ b/wifi/jarjar-rules.txt @@ -114,7 +114,6 @@ rule fi.iki.elonen.** com.android.wifi.x.@0 ## used by both framework-wifi and service-wifi ## rule android.content.pm.BaseParceledListSlice* com.android.wifi.x.@0 rule android.content.pm.ParceledListSlice* com.android.wifi.x.@0 -rule android.net.shared.Inet4AddressUtils* com.android.wifi.x.@0 rule android.net.util.MacAddressUtils* com.android.wifi.x.@0 rule android.net.util.nsd.DnsSdTxtRecord* com.android.wifi.x.@0 rule android.os.HandlerExecutor* com.android.wifi.x.@0 @@ -123,3 +122,5 @@ rule com.android.internal.util.AsyncChannel* com.android.wifi.x.@0 rule com.android.internal.util.AsyncService* com.android.wifi.x.@0 rule com.android.internal.util.Preconditions* com.android.wifi.x.@0 rule com.android.internal.util.Protocol* com.android.wifi.x.@0 + +rule com.android.net.module.util.** com.android.wifi.x.@0 diff --git a/wifi/java/android/net/wifi/WifiInfo.java b/wifi/java/android/net/wifi/WifiInfo.java index b841921355e9..53883674e058 100644 --- a/wifi/java/android/net/wifi/WifiInfo.java +++ b/wifi/java/android/net/wifi/WifiInfo.java @@ -22,12 +22,13 @@ import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; import android.net.NetworkInfo.DetailedState; -import android.net.shared.Inet4AddressUtils; import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; +import com.android.net.module.util.Inet4AddressUtils; + import java.net.Inet4Address; import java.net.InetAddress; import java.net.UnknownHostException; |