diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2020-06-08 15:34:22 +0900 |
|---|---|---|
| committer | Remi NGUYEN VAN <reminv@google.com> | 2020-06-12 18:46:54 +0900 |
| commit | c628adc6763aa9a4b08e7c65305236f853d58d20 (patch) | |
| tree | 0d3a347532d0e0150fe302cec36c83a5117c3cd3 /src/android/net/dhcp/DhcpPacket.java | |
| parent | b9364f50bc10ffb539cc773fa5d78d49e205033d (diff) | |
Move Inet[4]AddressUtils to libs/net
The classes should not be picked up from frameworks/base, as they are
part of several mainline modules.
Bug: 151052811
Test: m; manual: flashed, wifi and telephony working
Test: atest NetworkStackCoverageTests
Change-Id: I62da3419408b7eb71ea5319e8717fbb22c76a94e
Diffstat (limited to 'src/android/net/dhcp/DhcpPacket.java')
| -rw-r--r-- | src/android/net/dhcp/DhcpPacket.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/android/net/dhcp/DhcpPacket.java b/src/android/net/dhcp/DhcpPacket.java index d022973..3915740 100644 --- a/src/android/net/dhcp/DhcpPacket.java +++ b/src/android/net/dhcp/DhcpPacket.java @@ -22,7 +22,6 @@ import static com.android.server.util.NetworkStackConstants.IPV4_ADDR_ANY; import android.net.DhcpResults; import android.net.LinkAddress; import android.net.metrics.DhcpErrorEvent; -import android.net.shared.Inet4AddressUtils; import android.os.Build; import android.os.SystemProperties; import android.system.OsConstants; @@ -31,6 +30,7 @@ import android.text.TextUtils; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; +import com.android.net.module.util.Inet4AddressUtils; import com.android.networkstack.apishim.common.ShimUtils; import java.io.UnsupportedEncodingException; |