Merge changes from topic "metrics_cts_tests"
* changes:
Add utilities to test tap interface networks
Add PacketFilter utilities for DNS testing
diff --git a/staticlibs/devicetests/com/android/testutils/HandlerUtils.kt b/staticlibs/devicetests/com/android/testutils/HandlerUtils.kt
index 336e12c..861f45e 100644
--- a/staticlibs/devicetests/com/android/testutils/HandlerUtils.kt
+++ b/staticlibs/devicetests/com/android/testutils/HandlerUtils.kt
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+@file:JvmName("HandlerUtils")
+
package com.android.testutils
import android.os.ConditionVariable
diff --git a/staticlibs/devicetests/com/android/testutils/ParcelUtils.kt b/staticlibs/devicetests/com/android/testutils/ParcelUtils.kt
index 5784f7c..14ed8e9 100644
--- a/staticlibs/devicetests/com/android/testutils/ParcelUtils.kt
+++ b/staticlibs/devicetests/com/android/testutils/ParcelUtils.kt
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+@file:JvmName("ParcelUtils")
+
package com.android.testutils
import android.os.Parcel
diff --git a/staticlibs/hostdevice/com/android/testutils/ConcurrentUtils.kt b/staticlibs/hostdevice/com/android/testutils/ConcurrentUtils.kt
index a365af5..af4f96d 100644
--- a/staticlibs/hostdevice/com/android/testutils/ConcurrentUtils.kt
+++ b/staticlibs/hostdevice/com/android/testutils/ConcurrentUtils.kt
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+@file:JvmName("ConcurrentUtils")
+
package com.android.testutils
import java.util.concurrent.CountDownLatch
diff --git a/staticlibs/hostdevice/com/android/testutils/MiscAsserts.kt b/staticlibs/hostdevice/com/android/testutils/MiscAsserts.kt
index 4e86360..09126d7 100644
--- a/staticlibs/hostdevice/com/android/testutils/MiscAsserts.kt
+++ b/staticlibs/hostdevice/com/android/testutils/MiscAsserts.kt
@@ -14,6 +14,8 @@
* limitations under the License.
*/
+@file:JvmName("MiscAsserts")
+
package com.android.testutils
import com.android.testutils.ExceptionUtils.ThrowingRunnable
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 e3af97e..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
@@ -24,7 +24,7 @@
import static android.system.OsConstants.SOL_SOCKET;
import static android.system.OsConstants.SO_SNDTIMEO;
-import static com.android.testutils.MiscAssertsKt.assertThrows;
+import static com.android.testutils.MiscAsserts.assertThrows;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;