From ba792733824e4927943bede2b2380d37ce283ff0 Mon Sep 17 00:00:00 2001 From: Chalard Jean Date: Fri, 26 Jun 2020 18:34:52 +0900 Subject: [PATCH] Move util classes to their destination package Test: builds Change-Id: I93e9cfd968e08f983e3fd9f7196c455c79a0f32d (cherry picked from commit 7c9c12694aec7d688496a634f165661e0681773e) --- staticlibs/Android.bp | 11 ++++++++--- .../android/net/module}/util/FdEventsReader.java | 9 ++++----- .../android/net/module}/util/PacketReader.java | 3 +-- .../com/android/testutils/TapPacketReader.java | 2 +- .../android/net/module/util}/DnsSdTxtRecord.java | 2 +- .../net => com/android/net/module}/util/IpRange.java | 2 +- .../android/net/module}/util/LinkPropertiesUtils.java | 2 +- .../android/net/module}/util/MacAddressUtils.java | 2 +- .../net => com/android/net/module}/util/NetUtils.java | 2 +- staticlibs/jarjar-rules-shared.txt | 6 ------ staticlibs/tests/unit/Android.bp | 1 - staticlibs/tests/unit/AndroidManifest.xml | 2 ++ staticlibs/tests/unit/jarjar-rules.txt | 6 ------ .../tests/unit/src/android/net/util/IpRangeTest.java | 2 ++ .../src/android/net/util/LinkPropertiesUtilsTest.java | 6 ++++-- .../src/android/net/util/MacAddressUtilsTest.java | 2 ++ .../tests/unit/src/android/net/util/NetUtilsTest.java | 2 ++ .../com/android/net/module/util/PacketReaderTest.java | 7 ++----- 18 files changed, 33 insertions(+), 36 deletions(-) rename staticlibs/device/{android/net => com/android/net/module}/util/FdEventsReader.java (98%) rename staticlibs/device/{android/net => com/android/net/module}/util/PacketReader.java (94%) rename staticlibs/framework/{android/net/util/nsd => com/android/net/module/util}/DnsSdTxtRecord.java (99%) rename staticlibs/framework/{android/net => com/android/net/module}/util/IpRange.java (99%) rename staticlibs/framework/{android/net => com/android/net/module}/util/LinkPropertiesUtils.java (99%) rename staticlibs/framework/{android/net => com/android/net/module}/util/MacAddressUtils.java (99%) rename staticlibs/framework/{android/net => com/android/net/module}/util/NetUtils.java (98%) delete mode 100644 staticlibs/tests/unit/jarjar-rules.txt diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp index f4799f0c50..08f4c0e0a1 100644 --- a/staticlibs/Android.bp +++ b/staticlibs/Android.bp @@ -86,6 +86,13 @@ java_defaults { ], } +// 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: [ @@ -164,8 +171,6 @@ filegroup { 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", @@ -181,7 +186,7 @@ filegroup { name: "net-utils-wifi-service-common-srcs", srcs: [ "device/android/net/NetworkFactory.java", - "framework/android/net/util/NetUtils.java", + "framework/com/android/net/module/util/NetUtils.java", ], visibility: [ "//frameworks/opt/net/wifi/service", diff --git a/staticlibs/device/android/net/util/FdEventsReader.java b/staticlibs/device/com/android/net/module/util/FdEventsReader.java similarity index 98% rename from staticlibs/device/android/net/util/FdEventsReader.java rename to staticlibs/device/com/android/net/module/util/FdEventsReader.java index a5714aa5db..71ae13d80d 100644 --- a/staticlibs/device/android/net/util/FdEventsReader.java +++ b/staticlibs/device/com/android/net/module/util/FdEventsReader.java @@ -14,12 +14,14 @@ * limitations under the License. */ -// TODO : move this and PacketReader to com.android.net.module.util. -package android.net.util; +package com.android.net.module.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; @@ -27,9 +29,6 @@ import android.system.ErrnoException; 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/android/net/util/PacketReader.java b/staticlibs/device/com/android/net/module/util/PacketReader.java similarity index 94% rename from staticlibs/device/android/net/util/PacketReader.java rename to staticlibs/device/com/android/net/module/util/PacketReader.java index 61b3d6e294..66c47888c3 100644 --- a/staticlibs/device/android/net/util/PacketReader.java +++ b/staticlibs/device/com/android/net/module/util/PacketReader.java @@ -14,8 +14,7 @@ * limitations under the License. */ -// TODO : move this and FdEventsReader to com.android.net.module.util. -package android.net.util; +package com.android.net.module.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 c36f144584..52c4cc9344 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/android/net/util/nsd/DnsSdTxtRecord.java b/staticlibs/framework/com/android/net/module/util/DnsSdTxtRecord.java similarity index 99% rename from staticlibs/framework/android/net/util/nsd/DnsSdTxtRecord.java rename to staticlibs/framework/com/android/net/module/util/DnsSdTxtRecord.java index 81768f7ed1..760891b9fc 100644 --- a/staticlibs/framework/android/net/util/nsd/DnsSdTxtRecord.java +++ b/staticlibs/framework/com/android/net/module/util/DnsSdTxtRecord.java @@ -19,7 +19,7 @@ - fix set() to replace existing values */ -package android.net.util.nsd; +package com.android.net.module.util; import android.os.Parcelable; import android.os.Parcel; diff --git a/staticlibs/framework/android/net/util/IpRange.java b/staticlibs/framework/com/android/net/module/util/IpRange.java similarity index 99% rename from staticlibs/framework/android/net/util/IpRange.java rename to staticlibs/framework/com/android/net/module/util/IpRange.java index 099770bca4..40b57b10f0 100644 --- a/staticlibs/framework/android/net/util/IpRange.java +++ b/staticlibs/framework/com/android/net/module/util/IpRange.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.net.util; +package com.android.net.module.util; import static com.android.internal.annotations.VisibleForTesting.Visibility; diff --git a/staticlibs/framework/android/net/util/LinkPropertiesUtils.java b/staticlibs/framework/com/android/net/module/util/LinkPropertiesUtils.java similarity index 99% rename from staticlibs/framework/android/net/util/LinkPropertiesUtils.java rename to staticlibs/framework/com/android/net/module/util/LinkPropertiesUtils.java index 282fa10d2b..1565f2bc2f 100644 --- a/staticlibs/framework/android/net/util/LinkPropertiesUtils.java +++ b/staticlibs/framework/com/android/net/module/util/LinkPropertiesUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.net.util; +package com.android.net.module.util; import android.annotation.NonNull; import android.annotation.Nullable; diff --git a/staticlibs/framework/android/net/util/MacAddressUtils.java b/staticlibs/framework/com/android/net/module/util/MacAddressUtils.java similarity index 99% rename from staticlibs/framework/android/net/util/MacAddressUtils.java rename to staticlibs/framework/com/android/net/module/util/MacAddressUtils.java index 969d1270be..bc11fa2a7c 100644 --- a/staticlibs/framework/android/net/util/MacAddressUtils.java +++ b/staticlibs/framework/com/android/net/module/util/MacAddressUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.net.util; +package com.android.net.module.util; import android.annotation.NonNull; import android.annotation.Nullable; diff --git a/staticlibs/framework/android/net/util/NetUtils.java b/staticlibs/framework/com/android/net/module/util/NetUtils.java similarity index 98% rename from staticlibs/framework/android/net/util/NetUtils.java rename to staticlibs/framework/com/android/net/module/util/NetUtils.java index 302119ea11..4331b65de0 100644 --- a/staticlibs/framework/android/net/util/NetUtils.java +++ b/staticlibs/framework/com/android/net/module/util/NetUtils.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package android.net.util; +package com.android.net.module.util; import android.annotation.NonNull; import android.annotation.Nullable; diff --git a/staticlibs/jarjar-rules-shared.txt b/staticlibs/jarjar-rules-shared.txt index 9e618db19b..a7fda7c0ac 100644 --- a/staticlibs/jarjar-rules-shared.txt +++ b/staticlibs/jarjar-rules-shared.txt @@ -1,8 +1,2 @@ -# 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 f18ffcfdd5..cb2c7d8255 100644 --- a/staticlibs/tests/unit/Android.bp +++ b/staticlibs/tests/unit/Android.bp @@ -6,7 +6,6 @@ android_library { 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 cc9e09ea76..c747c8a585 100644 --- a/staticlibs/tests/unit/AndroidManifest.xml +++ b/staticlibs/tests/unit/AndroidManifest.xml @@ -17,6 +17,8 @@ + + diff --git a/staticlibs/tests/unit/jarjar-rules.txt b/staticlibs/tests/unit/jarjar-rules.txt deleted file mode 100644 index fceccfb755..0000000000 --- a/staticlibs/tests/unit/jarjar-rules.txt +++ /dev/null @@ -1,6 +0,0 @@ -# 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 f4d07e9b3e..677db6956f 100644 --- a/staticlibs/tests/unit/src/android/net/util/IpRangeTest.java +++ b/staticlibs/tests/unit/src/android/net/util/IpRangeTest.java @@ -28,6 +28,8 @@ import android.net.IpPrefix; 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 6ffcc1d0a9..342e9d7b49 100644 --- a/staticlibs/tests/unit/src/android/net/util/LinkPropertiesUtilsTest.java +++ b/staticlibs/tests/unit/src/android/net/util/LinkPropertiesUtilsTest.java @@ -26,11 +26,13 @@ import android.net.LinkAddress; 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 ad63b3c9eb..66d89ffd1d 100644 --- a/staticlibs/tests/unit/src/android/net/util/MacAddressUtilsTest.java +++ b/staticlibs/tests/unit/src/android/net/util/MacAddressUtilsTest.java @@ -24,6 +24,8 @@ import android.net.MacAddress; 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 903e80d369..338d1c80fe 100644 --- a/staticlibs/tests/unit/src/android/net/util/NetUtilsTest.java +++ b/staticlibs/tests/unit/src/android/net/util/NetUtilsTest.java @@ -27,6 +27,8 @@ import android.net.RouteInfo; 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 046a1d9d15..459801c272 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,7 +16,6 @@ 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; @@ -24,14 +23,13 @@ import static android.system.OsConstants.SOCK_NONBLOCK; 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; @@ -93,8 +91,7 @@ public class PacketReaderTest { Os.setsockoptTimeval(s, SOL_SOCKET, SO_SNDTIMEO, TIMEO); } catch (ErrnoException | SocketException e) { closeFd(s); - fail(); - return null; + throw new RuntimeException("Failed to create FD", e); } mLocalSocket = s;