LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Use the new NetworkStackConnector constructor" am: 062e45d48c am: d04dcdcea0 am: d624b40eaf

Browse Source 
Change-Id: I6c8c0455cfd96f653e1080fc0b7265374e3a418d
This commit is contained in:
Remi NGUYEN VAN
2020-05-01 04:57:35 +00:00
committed by Automerger Merge Worker
parent 0d0e77ef3e d624b40eaf
commit 59e1240e94
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) 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 override fun enforceNetworkStackCallingPermission() = Unit
} }
@@ -62,8 +62,8 @@ class TestNetworkStackService : Service() {
override fun sendNetworkConditionsBroadcast(context: Context, broadcast: Intent) = Unit override fun sendNetworkConditionsBroadcast(context: Context, broadcast: Intent) = Unit
} }
private inner class TestNetworkStackConnector(context: Context) : private inner class TestNetworkStackConnector(context: Context) : NetworkStackConnector(
NetworkStackConnector(context, TestPermissionChecker()) { context, TestPermissionChecker(), NetworkStackService.Dependencies()) {
private val network = Network(TEST_NETID) private val network = Network(TEST_NETID)
private val privateDnsBypassNetwork = TestNetwork(TEST_NETID) private val privateDnsBypassNetwork = TestNetwork(TEST_NETID)