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

Commit a6e8219c authored by Chiachang Wang's avatar Chiachang Wang Committed by android-build-merger
Browse files

Merge "Refactor based on new NetworkMonitor" 

am: 0d7ed793

Change-Id: I6f2f42dee11b2ee3db9e52817cd7aa871539aaed
parents 24d67683 0d7ed793

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

+3 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 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.NetworkMonitorConnector

import com.android.server.NetworkStackService.NetworkStackConnector

import com.android.server.connectivity.NetworkMonitor
@@ -88,7 +89,8 @@ class TestNetworkStackService : Service() { 
                    this.network,

                    mock(IpConnectivityLog::class.java), mock(SharedLog::class.java),

                    NetworkMonitorDeps(privateDnsBypassNetwork),

                    mock(DataStallStatsUtils::class.java))

                    mock(DataStallStatsUtils::class.java),

                    mock(TcpSocketTracker::class.java))

            cb.onNetworkMonitorCreated(NetworkMonitorConnector(nm, TestPermissionChecker()))

        }

    }