Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3683d768 authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Update constructor of NetworkMonitor" into rvc-dev am: d7df0c13 am:... 

Merge "Update constructor of NetworkMonitor" into rvc-dev am: d7df0c13 am: 49a4f38a am: ac29d518

Change-Id: I1cbc4a45179091c3da584bbf4d774d6deb720ca0
parents 1dc9b738 ac29d518

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

+0 −2
Original line number Diff line number Diff line
@@ -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()))

        }