From a065d07edfc07e3ccf66957f600db8bb02e16c8a Mon Sep 17 00:00:00 2001 From: Remi NGUYEN VAN Date: Tue, 28 Apr 2020 15:50:38 +0900 Subject: [PATCH] Use the new NetworkStackConnector constructor The constructor was changed to allow for unit tests. Bug: 137328719 Test: atest FrameworksNetIntegrationTests Change-Id: I46f247268310e12d420531745a22e93cf3550e89 --- .../server/net/integrationtests/TestNetworkStackService.kt | 6 +++--- 1 file 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 eec3cdbe8d..8c2de4035d 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)