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

Merge "Update constructor of NetworkMonitor" am: 3402ee64ed

Browse Source 
Change-Id: I5ef9b48946acb83ada644600117c604028a5c0b5
This commit is contained in:
Chiachang Wang
2020-03-30 08:56:34 +00:00
committed by Automerger Merge Worker
parent 4c3ce3670c 3402ee64ed
commit 63f5da7bb6
1 changed files with 0 additions and 2 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

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