Merge "Update constructor of NetworkMonitor" am: 42956a037c am: c513ab9b0c am: 6b34f49c99 am: 088f4a89f5 am: f52a73d6d8

Change-Id: I0c65eac7372513519683a84383936c9781c8ced4
This commit is contained in:
Chiachang Wang
2020-03-31 19:10:18 +00:00
committed by Automerger Merge Worker

View File

@@ -24,7 +24,6 @@ import android.net.Network
import android.net.metrics.IpConnectivityLog
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
@@ -91,7 +90,6 @@ class TestNetworkStackService : Service() {
mock(IpConnectivityLog::class.java), mock(SharedLog::class.java),
mock(NetworkStackService.NetworkStackServiceManager::class.java),
NetworkMonitorDeps(privateDnsBypassNetwork),
mock(DataStallStatsUtils::class.java),
mock(TcpSocketTracker::class.java))
cb.onNetworkMonitorCreated(NetworkMonitorConnector(nm, TestPermissionChecker()))
}