Merge "Update NetworkMonitor integration test constructor"
This commit is contained in:
@@ -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))
|
||||||
|
|||||||
Reference in New Issue
Block a user