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/Android.bp b/staticlibs/Android.bp
index 08f4c0e..f4799f0 100644
--- a/staticlibs/Android.bp
+++ b/staticlibs/Android.bp
@@ -86,13 +86,6 @@
],
}
-// Rules for moving classes part of the lib that haven't been
-// renamed yet for lack of time
-java_defaults {
- name: "net-utils-jarjar-shared",
- jarjar_rules: "jarjar-rules-shared.txt",
-}
-
java_library {
name: "net-tests-utils",
srcs: [
@@ -171,6 +164,8 @@
filegroup {
name: "net-utils-framework-wifi-common-srcs",
srcs: [
+ "framework/android/net/util/nsd/DnsSdTxtRecord.java",
+ "framework/android/net/util/MacAddressUtils.java",
"framework/com/android/net/module/util/**/*.java",
],
path: "framework",
@@ -186,7 +181,7 @@
name: "net-utils-wifi-service-common-srcs",
srcs: [
"device/android/net/NetworkFactory.java",
- "framework/com/android/net/module/util/NetUtils.java",
+ "framework/android/net/util/NetUtils.java",
],
visibility: [
"//frameworks/opt/net/wifi/service",
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;
diff --git a/staticlibs/devicetests/com/android/testutils/TapPacketReader.java b/staticlibs/devicetests/com/android/testutils/TapPacketReader.java
index 52c4cc9..c36f144 100644
--- a/staticlibs/devicetests/com/android/testutils/TapPacketReader.java
+++ b/staticlibs/devicetests/com/android/testutils/TapPacketReader.java
@@ -16,13 +16,13 @@
package com.android.testutils;
+import android.net.util.PacketReader;
import android.os.Handler;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.android.net.module.util.ArrayTrackRecord;
-import com.android.net.module.util.PacketReader;
import java.io.FileDescriptor;
import java.io.FileOutputStream;
diff --git a/staticlibs/framework/com/android/net/module/util/IpRange.java b/staticlibs/framework/android/net/util/IpRange.java
similarity index 99%
rename from staticlibs/framework/com/android/net/module/util/IpRange.java
rename to staticlibs/framework/android/net/util/IpRange.java
index 40b57b1..099770b 100644
--- a/staticlibs/framework/com/android/net/module/util/IpRange.java
+++ b/staticlibs/framework/android/net/util/IpRange.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.net.module.util;
+package android.net.util;
import static com.android.internal.annotations.VisibleForTesting.Visibility;
diff --git a/staticlibs/framework/com/android/net/module/util/LinkPropertiesUtils.java b/staticlibs/framework/android/net/util/LinkPropertiesUtils.java
similarity index 99%
rename from staticlibs/framework/com/android/net/module/util/LinkPropertiesUtils.java
rename to staticlibs/framework/android/net/util/LinkPropertiesUtils.java
index 1565f2b..282fa10 100644
--- a/staticlibs/framework/com/android/net/module/util/LinkPropertiesUtils.java
+++ b/staticlibs/framework/android/net/util/LinkPropertiesUtils.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.net.module.util;
+package android.net.util;
import android.annotation.NonNull;
import android.annotation.Nullable;
diff --git a/staticlibs/framework/com/android/net/module/util/MacAddressUtils.java b/staticlibs/framework/android/net/util/MacAddressUtils.java
similarity index 98%
rename from staticlibs/framework/com/android/net/module/util/MacAddressUtils.java
rename to staticlibs/framework/android/net/util/MacAddressUtils.java
index bc11fa2..969d127 100644
--- a/staticlibs/framework/com/android/net/module/util/MacAddressUtils.java
+++ b/staticlibs/framework/android/net/util/MacAddressUtils.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.net.module.util;
+package android.net.util;
import android.annotation.NonNull;
import android.annotation.Nullable;
diff --git a/staticlibs/framework/com/android/net/module/util/NetUtils.java b/staticlibs/framework/android/net/util/NetUtils.java
similarity index 98%
rename from staticlibs/framework/com/android/net/module/util/NetUtils.java
rename to staticlibs/framework/android/net/util/NetUtils.java
index 4331b65..302119e 100644
--- a/staticlibs/framework/com/android/net/module/util/NetUtils.java
+++ b/staticlibs/framework/android/net/util/NetUtils.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package com.android.net.module.util;
+package android.net.util;
import android.annotation.NonNull;
import android.annotation.Nullable;
diff --git a/staticlibs/framework/com/android/net/module/util/DnsSdTxtRecord.java b/staticlibs/framework/android/net/util/nsd/DnsSdTxtRecord.java
similarity index 99%
rename from staticlibs/framework/com/android/net/module/util/DnsSdTxtRecord.java
rename to staticlibs/framework/android/net/util/nsd/DnsSdTxtRecord.java
index 760891b..81768f7 100644
--- a/staticlibs/framework/com/android/net/module/util/DnsSdTxtRecord.java
+++ b/staticlibs/framework/android/net/util/nsd/DnsSdTxtRecord.java
@@ -19,7 +19,7 @@
- fix set() to replace existing values
*/
-package com.android.net.module.util;
+package android.net.util.nsd;
import android.os.Parcelable;
import android.os.Parcel;
diff --git a/staticlibs/jarjar-rules-shared.txt b/staticlibs/jarjar-rules-shared.txt
index a7fda7c..9e618db 100644
--- a/staticlibs/jarjar-rules-shared.txt
+++ b/staticlibs/jarjar-rules-shared.txt
@@ -1,2 +1,8 @@
+# TODO: move the classes to the target package in java
+rule android.net.util.IpRange* com.android.net.module.util.IpRange@1
+rule android.net.util.MacAddressUtils* com.android.net.module.util.MacAddressUtils@1
+rule android.net.util.LinkPropertiesUtils* com.android.net.module.util.LinkPropertiesUtils@1
+rule android.net.util.NetUtils* com.android.net.module.util.NetUtils@1
+rule android.net.util.nsd.** com.android.net.module.util.nsd.@1
rule android.annotation.** com.android.net.module.annotation.@1
rule com.android.internal.annotations.** com.android.net.module.annotation.@1
diff --git a/staticlibs/tests/unit/Android.bp b/staticlibs/tests/unit/Android.bp
index cb2c7d8..f18ffcf 100644
--- a/staticlibs/tests/unit/Android.bp
+++ b/staticlibs/tests/unit/Android.bp
@@ -6,6 +6,7 @@
name: "NetworkStaticLibTestsLib",
srcs: ["src/**/*.java","src/**/*.kt"],
min_sdk_version: "29",
+ jarjar_rules: "jarjar-rules.txt",
static_libs: [
"net-utils-framework-common",
"androidx.test.rules",
diff --git a/staticlibs/tests/unit/AndroidManifest.xml b/staticlibs/tests/unit/AndroidManifest.xml
index c747c8a..cc9e09e 100644
--- a/staticlibs/tests/unit/AndroidManifest.xml
+++ b/staticlibs/tests/unit/AndroidManifest.xml
@@ -17,8 +17,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.frameworks.libnet.tests">
- <uses-permission android:name="android.permission.INTERNET" />
-
<application>
<uses-library android:name="android.test.runner" />
</application>
diff --git a/staticlibs/tests/unit/jarjar-rules.txt b/staticlibs/tests/unit/jarjar-rules.txt
new file mode 100644
index 0000000..fceccfb
--- /dev/null
+++ b/staticlibs/tests/unit/jarjar-rules.txt
@@ -0,0 +1,6 @@
+# TODO: move the classes to the target package in java
+rule android.net.util.IpRange* com.android.net.module.util.IpRange@1
+rule android.net.util.MacAddressUtils* com.android.net.module.util.MacAddressUtils@1
+rule android.net.util.LinkPropertiesUtils* com.android.net.module.util.LinkPropertiesUtils@1
+rule android.net.util.NetUtils* com.android.net.module.util.NetUtils@1
+rule android.net.util.nsd.** com.android.net.module.util.nsd.@1
diff --git a/staticlibs/tests/unit/src/android/net/util/IpRangeTest.java b/staticlibs/tests/unit/src/android/net/util/IpRangeTest.java
index 677db69..f4d07e9 100644
--- a/staticlibs/tests/unit/src/android/net/util/IpRangeTest.java
+++ b/staticlibs/tests/unit/src/android/net/util/IpRangeTest.java
@@ -28,8 +28,6 @@
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
-import com.android.net.module.util.IpRange;
-
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/staticlibs/tests/unit/src/android/net/util/LinkPropertiesUtilsTest.java b/staticlibs/tests/unit/src/android/net/util/LinkPropertiesUtilsTest.java
index 342e9d7..6ffcc1d 100644
--- a/staticlibs/tests/unit/src/android/net/util/LinkPropertiesUtilsTest.java
+++ b/staticlibs/tests/unit/src/android/net/util/LinkPropertiesUtilsTest.java
@@ -26,13 +26,11 @@
import android.net.LinkProperties;
import android.net.ProxyInfo;
import android.net.RouteInfo;
+import android.net.util.LinkPropertiesUtils.CompareOrUpdateResult;
+import android.net.util.LinkPropertiesUtils.CompareResult;
import androidx.test.runner.AndroidJUnit4;
-import com.android.net.module.util.LinkPropertiesUtils;
-import com.android.net.module.util.LinkPropertiesUtils.CompareOrUpdateResult;
-import com.android.net.module.util.LinkPropertiesUtils.CompareResult;
-
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/staticlibs/tests/unit/src/android/net/util/MacAddressUtilsTest.java b/staticlibs/tests/unit/src/android/net/util/MacAddressUtilsTest.java
index 66d89ff..ad63b3c 100644
--- a/staticlibs/tests/unit/src/android/net/util/MacAddressUtilsTest.java
+++ b/staticlibs/tests/unit/src/android/net/util/MacAddressUtilsTest.java
@@ -24,8 +24,6 @@
import androidx.test.runner.AndroidJUnit4;
-import com.android.net.module.util.MacAddressUtils;
-
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/staticlibs/tests/unit/src/android/net/util/NetUtilsTest.java b/staticlibs/tests/unit/src/android/net/util/NetUtilsTest.java
index 338d1c8..903e80d 100644
--- a/staticlibs/tests/unit/src/android/net/util/NetUtilsTest.java
+++ b/staticlibs/tests/unit/src/android/net/util/NetUtilsTest.java
@@ -27,8 +27,6 @@
import androidx.test.runner.AndroidJUnit4;
-import com.android.net.module.util.NetUtils;
-
import org.junit.Test;
import org.junit.runner.RunWith;
diff --git a/staticlibs/tests/unit/src/com/android/net/module/util/PacketReaderTest.java b/staticlibs/tests/unit/src/com/android/net/module/util/PacketReaderTest.java
index 459801c..046a1d9 100644
--- a/staticlibs/tests/unit/src/com/android/net/module/util/PacketReaderTest.java
+++ b/staticlibs/tests/unit/src/com/android/net/module/util/PacketReaderTest.java
@@ -16,6 +16,7 @@
package com.android.net.module.util;
+import static android.net.util.PacketReader.DEFAULT_RECV_BUF_SIZE;
import static android.system.OsConstants.AF_INET6;
import static android.system.OsConstants.IPPROTO_UDP;
import static android.system.OsConstants.SOCK_DGRAM;
@@ -23,13 +24,14 @@
import static android.system.OsConstants.SOL_SOCKET;
import static android.system.OsConstants.SO_SNDTIMEO;
-import static com.android.net.module.util.PacketReader.DEFAULT_RECV_BUF_SIZE;
import static com.android.testutils.MiscAsserts.assertThrows;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+import android.net.util.PacketReader;
import android.os.Handler;
import android.os.HandlerThread;
import android.system.ErrnoException;
@@ -91,7 +93,8 @@
Os.setsockoptTimeval(s, SOL_SOCKET, SO_SNDTIMEO, TIMEO);
} catch (ErrnoException | SocketException e) {
closeFd(s);
- throw new RuntimeException("Failed to create FD", e);
+ fail();
+ return null;
}
mLocalSocket = s;