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

Merge "Refactor based on new NetworkMonitor"

Browse Source
This commit is contained in:
Chiachang Wang
2019-11-26 10:52:33 +00:00
committed by Gerrit Code Review
parent a8e2afde61 bfb1ab4b02
commit 4a41fe8072
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,6 +25,7 @@ import android.net.metrics.IpConnectivityLog
import android.net.util.SharedLog 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.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,7 +89,8 @@ class TestNetworkStackService : Service() {
this.network, this.network,
mock(IpConnectivityLog::class.java), mock(SharedLog::class.java), mock(IpConnectivityLog::class.java), mock(SharedLog::class.java),
NetworkMonitorDeps(privateDnsBypassNetwork), NetworkMonitorDeps(privateDnsBypassNetwork),
mock(DataStallStatsUtils::class.java)) mock(DataStallStatsUtils::class.java),
mock(TcpSocketTracker::class.java))
cb.onNetworkMonitorCreated(NetworkMonitorConnector(nm, TestPermissionChecker())) cb.onNetworkMonitorCreated(NetworkMonitorConnector(nm, TestPermissionChecker()))
} }
} }