Move PacketReader and FdEventReader
Test: FrameworksWifiTests FrameworksNetTests
Change-Id: I07c9850b55f5035671363e4e2613ec359a7962c3
Merged-In: I07c9850b55f5035671363e4e2613ec359a7962c3
diff --git a/common/moduleutils/src/android/net/ip/NetlinkMonitor.java b/common/moduleutils/src/android/net/ip/NetlinkMonitor.java
index 29e893b..3d314f1 100644
--- a/common/moduleutils/src/android/net/ip/NetlinkMonitor.java
+++ b/common/moduleutils/src/android/net/ip/NetlinkMonitor.java
@@ -26,7 +26,6 @@
import android.net.netlink.NetlinkErrorMessage;
import android.net.netlink.NetlinkMessage;
import android.net.netlink.NetlinkSocket;
-import android.net.util.PacketReader;
import android.net.util.SharedLog;
import android.net.util.SocketUtils;
import android.os.Handler;
@@ -35,6 +34,8 @@
import android.system.Os;
import android.util.Log;
+import com.android.net.module.util.PacketReader;
+
import java.io.FileDescriptor;
import java.io.IOException;
import java.net.SocketAddress;
diff --git a/src/android/net/dhcp/DhcpClient.java b/src/android/net/dhcp/DhcpClient.java
index dc3b836..362864b 100644
--- a/src/android/net/dhcp/DhcpClient.java
+++ b/src/android/net/dhcp/DhcpClient.java
@@ -74,7 +74,6 @@
import android.net.util.HostnameTransliterator;
import android.net.util.InterfaceParams;
import android.net.util.NetworkStackUtils;
-import android.net.util.PacketReader;
import android.net.util.SocketUtils;
import android.os.Build;
import android.os.Handler;
@@ -99,6 +98,7 @@
import com.android.internal.util.StateMachine;
import com.android.internal.util.TrafficStatsConstants;
import com.android.internal.util.WakeupMessage;
+import com.android.net.module.util.PacketReader;
import com.android.networkstack.R;
import com.android.networkstack.apishim.CaptivePortalDataShimImpl;
import com.android.networkstack.apishim.SocketUtilsShimImpl;
diff --git a/src/android/net/dhcp/DhcpPacketListener.java b/src/android/net/dhcp/DhcpPacketListener.java
index 656b642..17632a4 100644
--- a/src/android/net/dhcp/DhcpPacketListener.java
+++ b/src/android/net/dhcp/DhcpPacketListener.java
@@ -16,7 +16,6 @@
package android.net.dhcp;
-import android.net.util.FdEventsReader;
import android.os.Handler;
import android.system.Os;
import android.util.Log;
@@ -24,6 +23,8 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import com.android.net.module.util.FdEventsReader;
+
import java.io.FileDescriptor;
import java.net.Inet4Address;
import java.net.InetSocketAddress;
diff --git a/src/android/net/ip/ConnectivityPacketTracker.java b/src/android/net/ip/ConnectivityPacketTracker.java
index aa85f3a..c02f7d3 100644
--- a/src/android/net/ip/ConnectivityPacketTracker.java
+++ b/src/android/net/ip/ConnectivityPacketTracker.java
@@ -26,7 +26,6 @@
import android.net.util.ConnectivityPacketSummary;
import android.net.util.InterfaceParams;
import android.net.util.NetworkStackUtils;
-import android.net.util.PacketReader;
import android.os.Handler;
import android.os.SystemClock;
import android.system.ErrnoException;
@@ -37,6 +36,7 @@
import com.android.internal.util.HexDump;
import com.android.internal.util.TokenBucket;
+import com.android.net.module.util.PacketReader;
import java.io.FileDescriptor;
import java.io.IOException;
