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 | f071714309b596bdc6adb814c06f90c13636b4e1 (patch) | |
| tree | 8165c50674d0ae7df107ba1a02ce713bc0067d0c /src/android/net/dhcp/DhcpServingParams.java | |
| parent | def2536afacaa22f1fe4e8c21f496a8c641b5e8e (diff) | |
| parent | c628adc6763aa9a4b08e7c65305236f853d58d20 (diff) | |
Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev
Diffstat (limited to 'src/android/net/dhcp/DhcpServingParams.java')
| -rw-r--r-- | src/android/net/dhcp/DhcpServingParams.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/android/net/dhcp/DhcpServingParams.java b/src/android/net/dhcp/DhcpServingParams.java index 77cdf7a..97db6ae 100644 --- a/src/android/net/dhcp/DhcpServingParams.java +++ b/src/android/net/dhcp/DhcpServingParams.java @@ -16,9 +16,8 @@ package android.net.dhcp; -import static android.net.shared.Inet4AddressUtils.getPrefixMaskAsInet4Address; -import static android.net.shared.Inet4AddressUtils.intToInet4AddressHTH; - +import static com.android.net.module.util.Inet4AddressUtils.getPrefixMaskAsInet4Address; +import static com.android.net.module.util.Inet4AddressUtils.intToInet4AddressHTH; import static com.android.server.util.NetworkStackConstants.INFINITE_LEASE; import static com.android.server.util.NetworkStackConstants.IPV4_MAX_MTU; import static com.android.server.util.NetworkStackConstants.IPV4_MIN_MTU; @@ -27,12 +26,13 @@ import static java.lang.Integer.toUnsignedLong; import android.net.IpPrefix; import android.net.LinkAddress; -import android.net.shared.Inet4AddressUtils; import android.util.ArraySet; import androidx.annotation.NonNull; import androidx.annotation.Nullable; +import com.android.net.module.util.Inet4AddressUtils; + import java.net.Inet4Address; import java.util.Arrays; import java.util.Collections; |