Snap for 6493843 from 38b4ec9127c102c32f43bf54c0da164f9b6f5685 to mainline-release

Change-Id: I5f1314d39a5a842efaf45f7b554128d1da8d9303
This commit is contained in:
android-build-team Robot
2020-05-14 07:00:45 +00:00

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)