diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2020-06-19 01:22:33 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-19 01:22:33 +0000 |
| commit | 30d2184a5eb089d79fe3f45b3ef0cf0b2f165deb (patch) | |
| tree | 0d149a46b4c6c02ff664394557f8d4c2146380aa /src/android/net/dhcp/DhcpPacket.java | |
| parent | f978cfbc93d6cead109327220d1adce7bbc0e82e (diff) | |
| parent | 4b97bd9c11a6a3a4644eebe9afa39e59f8c9bc2e (diff) | |
Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: f071714309 am: 4b97bd9c11
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11849339
Change-Id: I3dae34fc5897ecc8c460957439eadc90342095c2
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; |