Merge changes Iab0ffbb5,I2cbe9906 am: 583d0d437a
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2646561
Change-Id: If6345d50690b204e90f9de25feeb3ea8e5566c51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt b/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt
index 5879065..98ea224 100644
--- a/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt
+++ b/tests/cts/net/src/android/net/cts/NetworkAgentTest.kt
@@ -130,7 +130,6 @@
import kotlin.test.assertTrue
import kotlin.test.fail
import org.junit.After
-import org.junit.Assume.assumeFalse
import org.junit.Before
import org.junit.Test
import org.junit.runner.RunWith
@@ -1215,7 +1214,6 @@
@Test
fun testUnregisterAfterReplacement() {
- assumeFalse(Build.isDebuggable()) // Disabled presubmit pending prebuilt update on U
// Keeps an eye on all test networks.
val matchAllCallback = TestableNetworkCallback(timeoutMs = DEFAULT_TIMEOUT_MS)
registerNetworkCallback(makeTestNetworkRequest(), matchAllCallback)
@@ -1486,7 +1484,6 @@
@Test
fun testNativeNetworkCreation_PhysicalNetwork() {
- assumeFalse(Build.isDebuggable()) // Disabled presubmit pending prebuilt update on U
doTestNativeNetworkCreation(
expectCreatedImmediately = SHOULD_CREATE_NETWORKS_IMMEDIATELY,
intArrayOf(TRANSPORT_CELLULAR))