joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Use the new NetworkStackConnector constructor" am: e294fb81c7

Browse source 
Change-Id: Ifaef8916460a4c3c275b9cdf20ee87b562a42785
This commit is contained in:
Remi NGUYEN VAN 2020-05-01 04:30:38 +00:00 • committed by Automerger Merge Worker
commit 23687eceeb
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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)