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

Commit 696261c8 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Automerger Merge Worker
Browse files

Merge "[SB Refactor] Update wifi network to inactive if carrier merged is... 

Merge "[SB Refactor] Update wifi network to inactive if carrier merged is lost." into udc-dev am: a0ae7d2d

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



Change-Id: I76c03b5b973fbd8e49d38a35edadc181dde69fb7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 30b6b392 a0ae7d2d

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImpl.kt

+4 −2
Original line number Diff line number Diff line
@@ -160,8 +160,10 @@ constructor( 


                            val wifi = currentWifi

                            if (

                                wifi is WifiNetworkModel.Active &&

                                    wifi.networkId == network.getNetId()

                                (wifi is WifiNetworkModel.Active &&

                                    wifi.networkId == network.getNetId()) ||

                                    (wifi is WifiNetworkModel.CarrierMerged &&

                                        wifi.networkId == network.getNetId())

                            ) {

                                val newNetworkModel = WifiNetworkModel.Inactive

                                currentWifi = newNetworkModel

packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/wifi/data/repository/prod/WifiRepositoryImplTest.kt

+28 −1
Original line number Diff line number Diff line
@@ -994,7 +994,7 @@ class WifiRepositoryImplTest : SysuiTestCase() { 
        }



    @Test

    fun wifiNetwork_currentNetworkLost_flowHasNoNetwork() =

    fun wifiNetwork_currentActiveNetworkLost_flowHasNoNetwork() =

        testScope.runTest {

            var latest: WifiNetworkModel? = null

            val job = underTest.wifiNetwork.onEach { latest = it }.launchIn(this)
@@ -1012,6 +1012,33 @@ class WifiRepositoryImplTest : SysuiTestCase() { 
            job.cancel()

        }



    /** Possible regression test for b/278618530. */

    @Test

    fun wifiNetwork_currentCarrierMergedNetworkLost_flowHasNoNetwork() =

        testScope.runTest {

            var latest: WifiNetworkModel? = null

            val job = underTest.wifiNetwork.onEach { latest = it }.launchIn(this)



            val wifiInfo =

                mock<WifiInfo>().apply {

                    whenever(this.isPrimary).thenReturn(true)

                    whenever(this.isCarrierMerged).thenReturn(true)

                }



            getNetworkCallback()

                .onCapabilitiesChanged(NETWORK, createWifiNetworkCapabilities(wifiInfo))

            assertThat(latest is WifiNetworkModel.CarrierMerged).isTrue()

            assertThat((latest as WifiNetworkModel.CarrierMerged).networkId).isEqualTo(NETWORK_ID)



            // WHEN we lose our current network

            getNetworkCallback().onLost(NETWORK)



            // THEN we update to no network

            assertThat(latest is WifiNetworkModel.Inactive).isTrue()



            job.cancel()

        }



    @Test

    fun wifiNetwork_unknownNetworkLost_flowHasPreviousNetwork() =

        testScope.runTest {