Merge "Mock QuiConnectionCloser in ConnectivityServiceTest" into main
This commit is contained in:
commit
0705d728b0
1 changed files with 8 additions and 0 deletions
|
|
@ -424,6 +424,7 @@ import com.android.server.connectivity.NetworkNotificationManager.NotificationTy
|
|||
import com.android.server.connectivity.PermissionMonitor;
|
||||
import com.android.server.connectivity.ProxyTracker;
|
||||
import com.android.server.connectivity.QosCallbackTracker;
|
||||
import com.android.server.connectivity.QuicConnectionCloser;
|
||||
import com.android.server.connectivity.SatelliteAccessController;
|
||||
import com.android.server.connectivity.TcpKeepaliveController;
|
||||
import com.android.server.connectivity.UidRangeUtils;
|
||||
|
|
@ -656,6 +657,7 @@ public class ConnectivityServiceTest {
|
|||
@Mock SatelliteCoarseUsageMetricsCollector mSatelliteCoarseUsageMetricsCollector;
|
||||
@Mock DefaultNetworkRematchMetrics mDefaultNetworkRematchMetrics;
|
||||
@Mock SatisfiedByLocalNetworkMetrics mSatisfiedByLocalNetworkMetrics;
|
||||
@Mock QuicConnectionCloser mQuicConnectionCloser;
|
||||
|
||||
// BatteryStatsManager is final and cannot be mocked with regular mockito, so just mock the
|
||||
// underlying binder calls.
|
||||
|
|
@ -2455,6 +2457,12 @@ public class ConnectivityServiceTest {
|
|||
public boolean shouldQueueNetworkAgentEventsInSystemServer() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public QuicConnectionCloser makeQuicConnectionCloser(
|
||||
final SparseArray<NetworkAgentInfo> networkForNetId, final Handler handler) {
|
||||
return mQuicConnectionCloser;
|
||||
}
|
||||
}
|
||||
|
||||
static class PermissionMonitorDependencies extends PermissionMonitor.Dependencies {
|
||||
|
|
|
|||
Loading…
Reference in a new issue