| commit | f0c16487423287eb2d0f8e001645af777426271d | [log] [tgz] |
|---|---|---|
| author | Chalard Jean <jchalard@google.com> | Mon Dec 21 06:33:30 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Dec 21 06:33:30 2020 +0000 |
| tree | f1c732517f6b2053fa702fc4f23891a6db1dfd32 | |
| parent | bc1e8924636db0f8341d6476e1cdcebbfa854e12 [diff] | |
| parent | e3db31f3471e3dda4a355616688d447345fdbc5b [diff] |
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
diff --git a/Tethering/src/android/net/ip/NeighborPacketForwarder.java b/Tethering/src/android/net/ip/NeighborPacketForwarder.java index 73fc833..084743d 100644 --- a/Tethering/src/android/net/ip/NeighborPacketForwarder.java +++ b/Tethering/src/android/net/ip/NeighborPacketForwarder.java
@@ -25,7 +25,6 @@ import static android.system.OsConstants.SOCK_RAW; import android.net.util.InterfaceParams; -import android.net.util.PacketReader; import android.net.util.SocketUtils; import android.net.util.TetheringUtils; import android.os.Handler; @@ -33,6 +32,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.Inet6Address;