commit 36fa4a55b431c6f413fd074c183654323a779276
author Lucas Lin <lucaslin@google.com> Wed May 12 17:21:55 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Wed May 12 17:21:55 2021 +0000
tree 06dbdc7ee8b3cb2dcc108396da1ab97326829e22
parent 01a59e4727bd3aca33712ec4df3d6e41753ee137
parent 266d39b4cba720b3f58c17e11d495ddc189dbd91

Merge "Remove sendNetworkConditionsBroadcast" into rvc-dev am: 542d796a9f

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

Change-Id: I4a64821743d6ee4e4ae9b9d2759e38369cde5656

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 8c2de40..649f71d 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
@@ -59,7 +59,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(
@@ -94,4 +93,4 @@
             cb.onNetworkMonitorCreated(NetworkMonitorConnector(nm, TestPermissionChecker()))
         }
     }
-}
\ No newline at end of file
+}