Revert "Move util classes to their destination package"
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: I6104ea5392b26069da9a54f3073fd408a0bc37a0
diff --git a/staticlibs/device/com/android/net/module/util/FdEventsReader.java b/staticlibs/device/android/net/util/FdEventsReader.java
similarity index 98%
rename from staticlibs/device/com/android/net/module/util/FdEventsReader.java
rename to staticlibs/device/android/net/util/FdEventsReader.java
index 71ae13d..a5714aa 100644
--- a/staticlibs/device/com/android/net/module/util/FdEventsReader.java
+++ b/staticlibs/device/android/net/util/FdEventsReader.java
@@ -14,14 +14,12 @@
* limitations under the License.
*/
-package com.android.net.module.util;
+// TODO : move this and PacketReader to com.android.net.module.util.
+package android.net.util;
import static android.os.MessageQueue.OnFileDescriptorEventListener.EVENT_ERROR;
import static android.os.MessageQueue.OnFileDescriptorEventListener.EVENT_INPUT;
-import android.annotation.NonNull;
-import android.annotation.Nullable;
-import android.net.util.SocketUtils;
import android.os.Handler;
import android.os.Looper;
import android.os.MessageQueue;
@@ -29,6 +27,9 @@
import android.system.OsConstants;
import android.util.Log;
+import android.annotation.NonNull;
+import android.annotation.Nullable;
+
import com.android.internal.annotations.VisibleForTesting;
import java.io.FileDescriptor;
diff --git a/staticlibs/device/com/android/net/module/util/PacketReader.java b/staticlibs/device/android/net/util/PacketReader.java
similarity index 94%
rename from staticlibs/device/com/android/net/module/util/PacketReader.java
rename to staticlibs/device/android/net/util/PacketReader.java
index 66c4788..61b3d6e 100644
--- a/staticlibs/device/com/android/net/module/util/PacketReader.java
+++ b/staticlibs/device/android/net/util/PacketReader.java
@@ -14,7 +14,8 @@
* limitations under the License.
*/
-package com.android.net.module.util;
+// TODO : move this and FdEventsReader to com.android.net.module.util.
+package android.net.util;
import static java.lang.Math.max;