Merge "Move module utils to the module package." am: fab11bb263 am: e3db31f347

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1531558

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0d9c29e041caba754e4cb72167678234707484d3
This commit is contained in:
Chalard Jean
2020-12-21 06:33:30 +00:00
committed by Automerger Merge Worker

View File

@@ -25,7 +25,6 @@ import static android.system.OsConstants.SOCK_NONBLOCK;
import static android.system.OsConstants.SOCK_RAW; import static android.system.OsConstants.SOCK_RAW;
import android.net.util.InterfaceParams; import android.net.util.InterfaceParams;
import android.net.util.PacketReader;
import android.net.util.SocketUtils; import android.net.util.SocketUtils;
import android.net.util.TetheringUtils; import android.net.util.TetheringUtils;
import android.os.Handler; import android.os.Handler;
@@ -33,6 +32,8 @@ import android.system.ErrnoException;
import android.system.Os; import android.system.Os;
import android.util.Log; import android.util.Log;
import com.android.net.module.util.PacketReader;
import java.io.FileDescriptor; import java.io.FileDescriptor;
import java.io.IOException; import java.io.IOException;
import java.net.Inet6Address; import java.net.Inet6Address;