summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Remi NGUYEN VAN <reminv@google.com> 2020-05-01 04:47:17 +0000
committer Remi NGUYEN VAN <reminv@google.com> 2020-05-13 09:18:52 +0000
commitf20a14a0d344e5ca64e0cc0cbab777e8e200ba68 (patch)
treed1120960eeb396d9f4503e985ff05ea9a47f09e0
parenta89c6163aa61570db3d9aa9733be86078c1347b4 (diff)
Use the new NetworkStackConnector constructor
The constructor was changed to allow for unit tests. Bug: 137328719 Test: atest FrameworksNetIntegrationTests Original-Change: https://android-review.googlesource.com/1295360 Merged-In: I46f247268310e12d420531745a22e93cf3550e89 Change-Id: I46f247268310e12d420531745a22e93cf3550e89
-rw-r--r--tests/net/integration/src/com/android/server/net/integrationtests/TestNetworkStackService.kt6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/net/integration/src/com/android/server/net/integrationtests/TestNetworkStackService.kt b/tests/net/integration/src/com/android/server/net/integrationtests/TestNetworkStackService.kt
index eec3cdbe8d7f..8c2de4035d0b 100644
--- a/tests/net/integration/src/com/android/server/net/integrationtests/TestNetworkStackService.kt
+++ b/tests/net/integration/src/com/android/server/net/integrationtests/TestNetworkStackService.kt
@@ -52,7 +52,7 @@ class TestNetworkStackService : Service() {
doReturn(mock(IBinder::class.java)).`when`(it).getSystemService(Context.NETD_SERVICE)
}
- private class TestPermissionChecker : NetworkStackConnector.PermissionChecker() {
+ private class TestPermissionChecker : NetworkStackService.PermissionChecker() {
override fun enforceNetworkStackCallingPermission() = Unit
}
@@ -62,8 +62,8 @@ class TestNetworkStackService : Service() {
override fun sendNetworkConditionsBroadcast(context: Context, broadcast: Intent) = Unit
}
- private inner class TestNetworkStackConnector(context: Context) :
- NetworkStackConnector(context, TestPermissionChecker()) {
+ private inner class TestNetworkStackConnector(context: Context) : NetworkStackConnector(
+ context, TestPermissionChecker(), NetworkStackService.Dependencies()) {
private val network = Network(TEST_NETID)
private val privateDnsBypassNetwork = TestNetwork(TEST_NETID)