Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove sendNetworkConditionsBroadcast" am: 6a6fa67d58 am: fc1928cedb

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1702485

Change-Id: Ib6299c1022f196453aa6f072bcc9ba7227bfe8f4
This commit is contained in:
Chiachang Wang
2021-05-12 10:04:29 +00:00
committed by Automerger Merge Worker
parent 597471e40d fc1928cedb
commit a450fc8a3f
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/res/AndroidManifest.xml
View File

@@ -404,6 +404,8 @@
<protected-broadcast android:name="android.net.wifi.p2p.action.WIFI_P2P_PERSISTENT_GROUPS_CHANGED" />
<protected-broadcast android:name="android.net.conn.TETHER_STATE_CHANGED" />
<protected-broadcast android:name="android.net.conn.INET_CONDITION_ACTION" />
<!-- This broadcast is no longer sent in S but it should stay protected to avoid third party
apps broadcasting this and confusing old system apps that may not have been updated. -->
<protected-broadcast android:name="android.net.conn.NETWORK_CONDITIONS_MEASURED" />
<protected-broadcast
android:name="android.net.ConnectivityService.action.PKT_CNT_SAMPLE_INTERVAL_ELAPSED" />

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

@@ -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()))
}
}
}
}