diff options
| author | Lucas Lin <lucaslin@google.com> | 2021-05-07 08:59:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-05-07 08:59:26 +0000 |
| commit | 0e768c90f56792e421e23b521cf80ffbd336ff6f (patch) | |
| tree | c405e95fdabc239e2709315c9c184885739753af /tests/net | |
| parent | cdd106a46348d2d6219e0ee31cff8e02d60ca6d2 (diff) | |
| parent | 8a9e884d0207169eba1a075d745b68e594c385f5 (diff) | |
Merge "Remove sendNetworkConditionsBroadcast" into mainline-prod am: 8a9e884d02
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14271579
Change-Id: I394ab3ceee1685c4fdabd27f8377a2f3227c33be
Diffstat (limited to 'tests/net')
| -rw-r--r-- | tests/net/integration/src/com/android/server/net/integrationtests/TestNetworkStackService.kt | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/net/integration/src/com/android/server/net/integrationtests/TestNetworkStackService.kt b/tests/net/integration/src/com/android/server/net/integrationtests/TestNetworkStackService.kt index a44ad1e05259..eff66584d6c1 100644 --- a/tests/net/integration/src/com/android/server/net/integrationtests/TestNetworkStackService.kt +++ b/tests/net/integration/src/com/android/server/net/integrationtests/TestNetworkStackService.kt @@ -61,7 +61,6 @@ class TestNetworkStackService : Service() { private class NetworkMonitorDeps(private val privateDnsBypassNetwork: Network) : NetworkMonitor.Dependencies() { override fun getPrivateDnsBypassNetwork(network: Network?) = privateDnsBypassNetwork - override fun sendNetworkConditionsBroadcast(context: Context, broadcast: Intent) = Unit } private inner class TestNetworkStackConnector(context: Context) : NetworkStackConnector( @@ -98,4 +97,4 @@ class TestNetworkStackService : Service() { cb.onNetworkMonitorCreated(NetworkMonitorConnector(nm, TestPermissionChecker())) } } -}
\ No newline at end of file +} |