Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f20a14a0 authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN
Browse files

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
parent a89c6163

tests/net/integration/src/com/android/server/net/integrationtests/TestNetworkStackService.kt

+3 −3
Original line number Diff line number Diff line
@@ -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)