commit 4c6045e033161334b4d1ee078a506b4202288efb
author Lucas Lin <lucaslin@google.com> Fri May 07 08:59:26 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri May 07 08:59:26 2021 +0000
tree f6f7b6c076a9a1b78c619ca454b56996f742c60d
parent 050f198ec013c8eeedc2c4fc4f1eebb5e159a8f4
parent 792f554dc93bc81fbf76731dbf4f8a42a0476271

Merge "Remove sendNetworkConditionsBroadcast" into mainline-prod am: 8a9e884d02

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14271579

Change-Id: I394ab3ceee1685c4fdabd27f8377a2f3227c33be

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

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
+}