diff options
| author | Chalard Jean <jchalard@google.com> | 2020-07-31 20:00:30 +0900 |
|---|---|---|
| committer | Chalard Jean <jchalard@google.com> | 2020-08-07 03:31:04 +0000 |
| commit | be0070934470a8eac43db2ee1a9eaa33d3d3ee41 (patch) | |
| tree | 78165520eee9958d276e721eb0ca628f3de18729 /core/java/android/net/StaticIpConfiguration.java | |
| parent | e5e46c6dfda90017e43b7c1c579b2099647bb004 (diff) | |
Revert "Revert "Move Inet[4]AddressUtils to libs/net""
This patch is still needed and should go in now that the
error is fixed.
The patch was submitted into rvc-dev and is already in
rvc-dev-plus-aosp (patch in in ag/11923559, revert
skipped in ag/12072199). A follow-up will remove the
unused services.net-module-wifi target.
Test: originally tested in aosp/1324109
Test: m; manual: flashed, wifi and telephony working
Test: atest NetworkStackCoverageTests
Change-Id: I1074eedb0b0f156a1135e11210ec102de15ea674
Merged-In: Icd141a992c46290c74929785e261a1cd57bc001b
Diffstat (limited to 'core/java/android/net/StaticIpConfiguration.java')
| -rw-r--r-- | core/java/android/net/StaticIpConfiguration.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/java/android/net/StaticIpConfiguration.java b/core/java/android/net/StaticIpConfiguration.java index f24a9bd53039..a973455baa04 100644 --- a/core/java/android/net/StaticIpConfiguration.java +++ b/core/java/android/net/StaticIpConfiguration.java @@ -21,11 +21,11 @@ import android.annotation.Nullable; import android.annotation.SystemApi; import android.annotation.TestApi; import android.compat.annotation.UnsupportedAppUsage; -import android.net.shared.InetAddressUtils; import android.os.Parcel; import android.os.Parcelable; import com.android.internal.util.Preconditions; +import com.android.net.module.util.InetAddressUtils; import java.net.InetAddress; import java.util.ArrayList; |