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

Commit b2d32d58 authored by Chalard Jean's avatar Chalard Jean
Browse files

Move PacketReader and FdEventReader 

Test: FrameworksWifiTests FrameworksNetTests
Change-Id: I07c9850b55f5035671363e4e2613ec359a7962c3
(cherry picked from commit f66fa1c0395be59465296292536e33be48af7981)
parent 2b042543

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

+2 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 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;
@@ -35,6 +34,8 @@ 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,7 +74,6 @@ 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;
@@ -99,6 +98,7 @@ 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

+2 −1
Original line number Diff line number Diff line
@@ -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 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,7 +26,6 @@ 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;
@@ -37,6 +36,7 @@ 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;