Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

This project is archived. Its data is read-only.

Commit 22341bfe authored Oct 02, 2020 by TreeHugger Robot Committed by Automerger Merge Worker Oct 02, 2020

Merge "Revert "Move PacketReader and FdEventReader"" am: f31d132b

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/12746731

Change-Id: I94f3e0fec2a48c882dd3d02437008ed9a3fb9e10

parents cd6a3351 f31d132b

common/moduleutils/src/android/net/ip/NetlinkMonitor.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import android.annotation.NonNull;
		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;
		@@ -34,8 +35,6 @@ import android.system.ErrnoException;
		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;

src/android/net/dhcp/DhcpClient.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -74,6 +74,7 @@ import android.net.metrics.IpConnectivityLog;
		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;
		@@ -98,7 +99,6 @@ import com.android.internal.util.State;
		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;

src/android/net/dhcp/DhcpPacketListener.java

+1 −2

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.net.dhcp;

		import android.net.util.FdEventsReader;
		import android.os.Handler;
		import android.system.Os;
		import android.util.Log;
		@@ -23,8 +24,6 @@ import android.util.Log;
		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;

src/android/net/ip/ConnectivityPacketTracker.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import static android.system.OsConstants.SOCK_RAW;
		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;
		@@ -36,7 +37,6 @@ import android.util.Log;

		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;