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

Commit 4b516a6b authored by Hridya Valsaraju's avatar Hridya Valsaraju
Browse files

Revert "Move PacketReader and FdEventReader" 

Revert "Move static utils to a module package"

Revert "Move static utils to a module package"

Revert submission 12698912-move_packetreader

Reason for revert: Broke presubmit on git_master, b/169861635
Reverted Changes:
If5d1e4a58:Move module utils to the module package.
I44ffaad3d:Move PacketReader and FdEventReader
I93e9cfd96:Move util classes to their destination package
Ia84d64130:Move static utils to a module package
Iaac2810c7:Move static utils to a module package

Change-Id: I2b715c5511dae78c30b64e6a3f3eef525b6ec40a
parent 3d5cd944

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;