diff options
Diffstat (limited to 'common/testutils')
3 files changed, 6 insertions, 6 deletions
diff --git a/common/testutils/devicetests/com/android/testutils/FakeDns.kt b/common/testutils/devicetests/com/android/testutils/FakeDns.kt index 825d7487..1f82a35d 100644 --- a/common/testutils/devicetests/com/android/testutils/FakeDns.kt +++ b/common/testutils/devicetests/com/android/testutils/FakeDns.kt @@ -81,9 +81,9 @@ class FakeDns(val mockResolver: DnsResolver) { var type = if (posType != -1) it.arguments[posType] as Int else TYPE_UNSPECIFIED val answer = getAnswer(hostname, type) - if (!answer?.addresses.isNullOrEmpty()) { + if (answer != null && !answer.addresses.isNullOrEmpty()) { Handler(Looper.getMainLooper()).post({ executor.execute({ - callback.onAnswer(answer?.addresses, 0); }) }) + callback.onAnswer(answer.addresses, 0); }) }) } } diff --git a/common/testutils/devicetests/com/android/testutils/PacketBridge.kt b/common/testutils/devicetests/com/android/testutils/PacketBridge.kt index da3508de..d50f78a1 100644 --- a/common/testutils/devicetests/com/android/testutils/PacketBridge.kt +++ b/common/testutils/devicetests/com/android/testutils/PacketBridge.kt @@ -48,8 +48,8 @@ class PacketBridge( private val natMap = NatMap() private val binder = Binder() - private val cm = context.getSystemService(ConnectivityManager::class.java) - private val tnm = context.getSystemService(TestNetworkManager::class.java) + private val cm = context.getSystemService(ConnectivityManager::class.java)!! + private val tnm = context.getSystemService(TestNetworkManager::class.java)!! // Create test networks. private val internalIface = tnm.createTunInterface(listOf(internalAddr)) diff --git a/common/testutils/devicetests/com/android/testutils/TestNetworkTracker.kt b/common/testutils/devicetests/com/android/testutils/TestNetworkTracker.kt index b743b6c9..84fb47bc 100644 --- a/common/testutils/devicetests/com/android/testutils/TestNetworkTracker.kt +++ b/common/testutils/devicetests/com/android/testutils/TestNetworkTracker.kt @@ -91,7 +91,7 @@ private fun initTestNetwork( lp: LinkProperties?, setupTimeoutMs: Long = 10_000L ): TestNetworkTracker { - val tnm = context.getSystemService(TestNetworkManager::class.java) + val tnm = context.getSystemService(TestNetworkManager::class.java)!! val iface = if (isAtLeastS()) tnm.createTunInterface(linkAddrs) else tnm.createTunInterface(linkAddrs.toTypedArray()) val lpWithIface = if (lp == null) null else LinkProperties(lp).apply { @@ -112,7 +112,7 @@ class TestNetworkTracker internal constructor( val lp: LinkProperties?, setupTimeoutMs: Long ) : TestableNetworkCallback.HasNetwork { - private val cm = context.getSystemService(ConnectivityManager::class.java) + private val cm = context.getSystemService(ConnectivityManager::class.java)!! private val binder = Binder() private val networkCallback: NetworkCallback |