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

Commit bfb3e508 authored by lucaslin's avatar lucaslin Committed by Chiachang Wang
Browse files

Remove sendNetworkConditionsBroadcast 

sendNetworkConditionsBroadcast is removed, so
TestNetworkStackService.kt cannot override it anymore,
otherwise there will be a build break when running this
test.
Also add a comment for NETWORK_CONDITIONS_MEASURED in
AndroidManifest.xml.

Bug: 124415874
Test: atest FrameworksNetIntegrationTests
Change-Id: I7b43940dc32826c70fa82f471b35bc5cb8394aad
Merged-In: I7b43940dc32826c70fa82f471b35bc5cb8394aad
parent e01bb41a

core/res/AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -398,6 +398,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" />

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

+1 −2
Original line number Diff line number Diff line
@@ -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(