diff options
| author | Chalard Jean <jchalard@google.com> | 2020-08-19 16:07:22 +0900 |
|---|---|---|
| committer | Chalard Jean <jchalard@google.com> | 2020-12-16 11:44:22 +0900 |
| commit | 95b575f46872ebca9f0dcf6add5986fc61b5b0fe (patch) | |
| tree | f6bca1940e44211b0eae758bcb75bb7ae6c080d1 /core/java | |
| parent | 0070e26a5e307852bac9aeda608b053b4a9f2bcb (diff) | |
Move module utils to the module package.
Test: FrameworksWifiTest FrameworksNetTest
Change-Id: If5d1e4a58fb2d6d9544e6d01995dabe445cf1f25
Merged-In: I067eeecd458c34b7f2fbfa439072682661ac750c
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/net/LinkProperties.java | 3 | ||||
| -rw-r--r-- | core/java/android/net/MacAddress.java | 2 | ||||
| -rw-r--r-- | core/java/android/net/RouteInfo.java | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/core/java/android/net/LinkProperties.java b/core/java/android/net/LinkProperties.java index 0941e7dbed17..486e2d74dd05 100644 --- a/core/java/android/net/LinkProperties.java +++ b/core/java/android/net/LinkProperties.java @@ -20,12 +20,13 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; -import android.net.util.LinkPropertiesUtils; import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import android.text.TextUtils; +import com.android.net.module.util.LinkPropertiesUtils; + import java.net.Inet4Address; import java.net.Inet6Address; import java.net.InetAddress; diff --git a/core/java/android/net/MacAddress.java b/core/java/android/net/MacAddress.java index 178183dbe043..c7116b41e80a 100644 --- a/core/java/android/net/MacAddress.java +++ b/core/java/android/net/MacAddress.java @@ -20,13 +20,13 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.compat.annotation.UnsupportedAppUsage; -import android.net.util.MacAddressUtils; import android.net.wifi.WifiInfo; import android.os.Build; import android.os.Parcel; import android.os.Parcelable; import com.android.internal.util.Preconditions; +import com.android.net.module.util.MacAddressUtils; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/core/java/android/net/RouteInfo.java b/core/java/android/net/RouteInfo.java index 6166a753d83e..94f849f006f3 100644 --- a/core/java/android/net/RouteInfo.java +++ b/core/java/android/net/RouteInfo.java @@ -21,11 +21,12 @@ import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.SystemApi; import android.compat.annotation.UnsupportedAppUsage; -import android.net.util.NetUtils; import android.os.Build; import android.os.Parcel; import android.os.Parcelable; +import com.android.net.module.util.NetUtils; + import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.net.Inet4Address; |