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

Commit 3cb35906 authored by James Mattis's avatar James Mattis
Browse files

Adding support for multiple "default" networks 

Updating ConnectivityService foundational support for multiple default
networks by extending mDefaultRequest and mDefaultNetworkNai from single
instances to a HashMap to support more than a single default network.

Bug: 176027457
Bug: 172347841
Test: atest FrameworksNetTests
atest NetworkStackTests
atest FrameworksNetIntegrationTests
atest NetworkStackIntegrationTests
atest CtsNetTestCasesLatestSdk

Change-Id: I2f5fa96c2d21ab883499e82afa74e73f3ca606cd
parent 5becb8f3

services/core/java/com/android/server/ConnectivityService.java

+159 −125

File changed.

Preview size limit exceeded, changes collapsed.

tests/net/java/com/android/server/LegacyTypeTrackerTest.kt

+3 −3
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ class LegacyTypeTrackerTest { 
    private val supportedTypes = arrayOf(TYPE_MOBILE, TYPE_WIFI, TYPE_ETHERNET, TYPE_MOBILE_SUPL)



    private val mMockService = mock(ConnectivityService::class.java).apply {

        doReturn(false).`when`(this).isDefaultNetwork(any())

        doReturn(false).`when`(this).isFallbackNetwork(any())

    }

    private val mTracker = LegacyTypeTracker(mMockService).apply {

        supportedTypes.forEach {
@@ -126,11 +126,11 @@ class LegacyTypeTrackerTest { 
    fun testBroadcastOnDisconnect() {

        val mobileNai1 = mock(NetworkAgentInfo::class.java)

        val mobileNai2 = mock(NetworkAgentInfo::class.java)

        doReturn(false).`when`(mMockService).isDefaultNetwork(mobileNai1)

        doReturn(false).`when`(mMockService).isFallbackNetwork(mobileNai1)

        mTracker.add(TYPE_MOBILE, mobileNai1)

        verify(mMockService).sendLegacyNetworkBroadcast(mobileNai1, CONNECTED, TYPE_MOBILE)

        reset(mMockService)

        doReturn(false).`when`(mMockService).isDefaultNetwork(mobileNai2)

        doReturn(false).`when`(mMockService).isFallbackNetwork(mobileNai2)

        mTracker.add(TYPE_MOBILE, mobileNai2)

        verify(mMockService, never()).sendLegacyNetworkBroadcast(any(), any(), anyInt())

        mTracker.remove(TYPE_MOBILE, mobileNai1, false /* wasDefault */)