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/DhcpServer.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/DhcpServer.java')
| -rw-r--r-- | src/android/net/dhcp/DhcpServer.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/android/net/dhcp/DhcpServer.java b/src/android/net/dhcp/DhcpServer.java index 55b1f28..6c95b5a 100644 --- a/src/android/net/dhcp/DhcpServer.java +++ b/src/android/net/dhcp/DhcpServer.java @@ -23,8 +23,6 @@ import static android.net.dhcp.DhcpPacket.ENCAP_BOOTP; import static android.net.dhcp.IDhcpServer.STATUS_INVALID_ARGUMENT; import static android.net.dhcp.IDhcpServer.STATUS_SUCCESS; import static android.net.dhcp.IDhcpServer.STATUS_UNKNOWN_ERROR; -import static android.net.shared.Inet4AddressUtils.getBroadcastAddress; -import static android.net.shared.Inet4AddressUtils.getPrefixMaskAsInet4Address; import static android.net.util.NetworkStackUtils.DHCP_RAPID_COMMIT_VERSION; import static android.provider.DeviceConfig.NAMESPACE_CONNECTIVITY; import static android.system.OsConstants.AF_INET; @@ -36,6 +34,8 @@ import static android.system.OsConstants.SO_BROADCAST; import static android.system.OsConstants.SO_REUSEADDR; import static com.android.internal.util.TrafficStatsConstants.TAG_SYSTEM_DHCP_SERVER; +import static com.android.net.module.util.Inet4AddressUtils.getBroadcastAddress; +import static com.android.net.module.util.Inet4AddressUtils.getPrefixMaskAsInet4Address; import static com.android.server.util.NetworkStackConstants.INFINITE_LEASE; import static com.android.server.util.NetworkStackConstants.IPV4_ADDR_ALL; import static com.android.server.util.NetworkStackConstants.IPV4_ADDR_ANY; |