commit | 7e3fb2c18a2491f864ff605feeb921a4f7f1ce88 | [log] [tgz] |
---|---|---|
author | Chiachang Wang <chiachangwang@google.com> | Wed May 12 10:04:29 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed May 12 10:04:29 2021 +0000 |
tree | 7c868913592ca0468404d781ad8f8858e87812fa | |
parent | bcede3e59b5459f6663c169a97d77e64ffd53eea [diff] | |
parent | d37e9952630f2687cd032e0bc93c9aed6c99467b [diff] |
Merge "Remove sendNetworkConditionsBroadcast" am: 536e82f56b am: d37e995263 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702485 Change-Id: Ib6299c1022f196453aa6f072bcc9ba7227bfe8f4
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 a44ad1e..eff6658 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 @@ 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 @@ cb.onNetworkMonitorCreated(NetworkMonitorConnector(nm, TestPermissionChecker())) } } -} \ No newline at end of file +}