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

Merge "Update NetworkMonitor integration test constructor" am: 488af7c7d2 am: 3114fc2310

Browse Source 
Change-Id: Ibd4c6ad05acf81513b54b41341b6ed0203480471
This commit is contained in:
Automerger Merge Worker
2020-02-20 01:38:04 +00:00
parent 074d8a34f3 3114fc2310
commit f737906f24
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,6 +26,7 @@ import android.net.util.SharedLog
import android.os.IBinder import android.os.IBinder
import com.android.networkstack.metrics.DataStallStatsUtils import com.android.networkstack.metrics.DataStallStatsUtils
import com.android.networkstack.netlink.TcpSocketTracker import com.android.networkstack.netlink.TcpSocketTracker
import com.android.server.NetworkStackService
import com.android.server.NetworkStackService.NetworkMonitorConnector import com.android.server.NetworkStackService.NetworkMonitorConnector
import com.android.server.NetworkStackService.NetworkStackConnector import com.android.server.NetworkStackService.NetworkStackConnector
import com.android.server.connectivity.NetworkMonitor import com.android.server.connectivity.NetworkMonitor
@@ -88,6 +89,7 @@ class TestNetworkStackService : Service() {
val nm = NetworkMonitor(this@TestNetworkStackService, cb, val nm = NetworkMonitor(this@TestNetworkStackService, cb,
this.network, this.network,
mock(IpConnectivityLog::class.java), mock(SharedLog::class.java), mock(IpConnectivityLog::class.java), mock(SharedLog::class.java),
mock(NetworkStackService.NetworkStackServiceManager::class.java),
NetworkMonitorDeps(privateDnsBypassNetwork), NetworkMonitorDeps(privateDnsBypassNetwork),
mock(DataStallStatsUtils::class.java), mock(DataStallStatsUtils::class.java),
mock(TcpSocketTracker::class.java)) mock(TcpSocketTracker::class.java))