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

Change-Id: Ifc184f8262b33ddbbad1ccc7a1ef0b67259f2e55
This commit is contained in:
Automerger Merge Worker
2020-02-20 04:31:39 +00:00

View File

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