diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2020-06-19 01:08:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-19 01:08:47 +0000 |
| commit | 4b97bd9c11a6a3a4644eebe9afa39e59f8c9bc2e (patch) | |
| tree | 8165c50674d0ae7df107ba1a02ce713bc0067d0c /src/android/net/dhcp/DhcpLeaseRepository.java | |
| parent | 83a1744ce7a614d61756e9d1dbbbbe8fb7decb00 (diff) | |
| parent | f071714309b596bdc6adb814c06f90c13636b4e1 (diff) | |
Merge "Move Inet[4]AddressUtils to libs/net" into rvc-dev am: f071714309
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/11849339
Change-Id: Ia4b1bf5764bf157e6181ef1481856219a9cfcb2f
Diffstat (limited to 'src/android/net/dhcp/DhcpLeaseRepository.java')
| -rw-r--r-- | src/android/net/dhcp/DhcpLeaseRepository.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/android/net/dhcp/DhcpLeaseRepository.java b/src/android/net/dhcp/DhcpLeaseRepository.java index b7a2572..8420996 100644 --- a/src/android/net/dhcp/DhcpLeaseRepository.java +++ b/src/android/net/dhcp/DhcpLeaseRepository.java @@ -18,10 +18,10 @@ package android.net.dhcp; import static android.net.dhcp.DhcpLease.EXPIRATION_NEVER; import static android.net.dhcp.DhcpLease.inet4AddrToString; -import static android.net.shared.Inet4AddressUtils.inet4AddressToIntHTH; -import static android.net.shared.Inet4AddressUtils.intToInet4AddressHTH; -import static android.net.shared.Inet4AddressUtils.prefixLengthToV4NetmaskIntHTH; +import static com.android.net.module.util.Inet4AddressUtils.inet4AddressToIntHTH; +import static com.android.net.module.util.Inet4AddressUtils.intToInet4AddressHTH; +import static com.android.net.module.util.Inet4AddressUtils.prefixLengthToV4NetmaskIntHTH; import static com.android.server.util.NetworkStackConstants.IPV4_ADDR_ANY; import static com.android.server.util.NetworkStackConstants.IPV4_ADDR_BITS; |