Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a450fc8a authored by Chiachang Wang's avatar Chiachang Wang Committed by Automerger Merge Worker
Browse files

Merge "Remove sendNetworkConditionsBroadcast" am: 6a6fa67d am: fc1928ce 

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

Change-Id: Ib6299c1022f196453aa6f072bcc9ba7227bfe8f4
parents 597471e4 fc1928ce

core/res/AndroidManifest.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -404,6 +404,8 @@ 
    <protected-broadcast android:name="android.net.wifi.p2p.action.WIFI_P2P_PERSISTENT_GROUPS_CHANGED" />

    <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.TETHER_STATE_CHANGED" />

    <protected-broadcast android:name="android.net.conn.INET_CONDITION_ACTION" />

    <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.conn.NETWORK_CONDITIONS_MEASURED" />

    <protected-broadcast

    <protected-broadcast

            android:name="android.net.ConnectivityService.action.PKT_CNT_SAMPLE_INTERVAL_ELAPSED" />

            android:name="android.net.ConnectivityService.action.PKT_CNT_SAMPLE_INTERVAL_ELAPSED" />

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -61,7 +61,6 @@ class TestNetworkStackService : Service() { 
    private class NetworkMonitorDeps(private val privateDnsBypassNetwork: Network) :

    private class NetworkMonitorDeps(private val privateDnsBypassNetwork: Network) :

            NetworkMonitor.Dependencies() {

            NetworkMonitor.Dependencies() {

        override fun getPrivateDnsBypassNetwork(network: Network?) = privateDnsBypassNetwork

        override fun getPrivateDnsBypassNetwork(network: Network?) = privateDnsBypassNetwork

        override fun sendNetworkConditionsBroadcast(context: Context, broadcast: Intent) = Unit

    }

    }





    private inner class TestNetworkStackConnector(context: Context) : NetworkStackConnector(

    private inner class TestNetworkStackConnector(context: Context) : NetworkStackConnector(