diff options
| author | 2020-05-01 04:19:29 +0000 | |
|---|---|---|
| committer | 2020-05-01 04:19:29 +0000 | |
| commit | 97c8cc81a17ee8fb085b2649ad4d9b55e8eff97d (patch) | |
| tree | 2c463ba2cf9e31309aecfda2dbd52459e602f4ff | |
| parent | 5f2cebc10ab90950f9ae508281de63c5bbb568cd (diff) | |
| parent | e96fc18ad8feecbdb498a8bea00b8e7b1e8c5203 (diff) | |
Merge "Use the new NetworkStackConnector constructor"
| -rw-r--r-- | tests/net/integration/src/com/android/server/net/integrationtests/TestNetworkStackService.kt | 6 |
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) |