Merge changes from topic "cherrypicker-L48400000954920366:N08700001270826034" into tm-dev am: d67018db2d am: b9ab038918
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/18727826
Change-Id: Ia5b0d1fe8b2e96170d56878cc75a987d7ce7085f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/cts/net/src/android/net/cts/NsdManagerTest.kt b/tests/cts/net/src/android/net/cts/NsdManagerTest.kt
index 64cc97d..69ec189 100644
--- a/tests/cts/net/src/android/net/cts/NsdManagerTest.kt
+++ b/tests/cts/net/src/android/net/cts/NsdManagerTest.kt
@@ -65,6 +65,7 @@
import org.junit.Assert.assertTrue
import org.junit.Assume.assumeTrue
import org.junit.Before
+import org.junit.Ignore
import org.junit.Test
import org.junit.runner.RunWith
import java.net.ServerSocket
@@ -463,7 +464,7 @@
}
}
- @Test
+ @Test @Ignore // TODO(b/234099453): re-enable when the prebuilt module is updated
fun testNsdManager_DiscoverWithNetworkRequest() {
// This test requires shims supporting T+ APIs (discovering on network request)
assumeTrue(TestUtils.shouldTestTApis())
@@ -531,7 +532,7 @@
}
}
- @Test
+ @Test @Ignore // TODO(b/234099453): re-enable when the prebuilt module is updated
fun testNsdManager_DiscoverWithNetworkRequest_NoMatchingNetwork() {
// This test requires shims supporting T+ APIs (discovering on network request)
assumeTrue(TestUtils.shouldTestTApis())