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

Commit 79074be7 authored by Evan Laird's avatar Evan Laird Committed by Automerger Merge Worker
Browse files

Merge "[Sb refactor] Ensure config is fetched on flow start" into udc-dev am:... 

Merge "[Sb refactor] Ensure config is fetched on flow start" into udc-dev am: 06341694 am: 9650ae32

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



Change-Id: I88550d05a3745c19aa825f6e5083fe17787d5e07
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bcac7a95 9650ae32

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionsRepositoryImpl.kt

+1 −0
Original line number Diff line number Diff line
@@ -233,6 +233,7 @@ constructor( 


    override val defaultDataSubRatConfig: StateFlow<Config> =

        merge(defaultDataSubIdChangeEvent, carrierConfigChangedEvent)

            .onStart { emit(Unit) }

            .mapLatest { Config.readConfig(context) }

            .distinctUntilChanged()

            .onEach { logger.logDefaultDataSubRatConfig(it) }

packages/SystemUI/tests/src/com/android/systemui/statusbar/pipeline/mobile/data/repository/prod/MobileConnectionsRepositoryTest.kt

+27 −0
Original line number Diff line number Diff line
@@ -1111,6 +1111,33 @@ class MobileConnectionsRepositoryTest : SysuiTestCase() { 
            assertThat(latest!!.showAtLeast3G).isTrue()

        }



    @Test

    fun carrierConfig_initialValueIsFetched() =

        testScope.runTest {



            // Value starts out false

            assertThat(underTest.defaultDataSubRatConfig.value.showAtLeast3G).isFalse()



            overrideResource(R.bool.config_showMin3G, true)

            val configFromContext = MobileMappings.Config.readConfig(context)

            assertThat(configFromContext.showAtLeast3G).isTrue()



            // WHEN the change event is fired

            fakeBroadcastDispatcher.registeredReceivers.forEach { receiver ->

                receiver.onReceive(

                    context,

                    Intent(CarrierConfigManager.ACTION_CARRIER_CONFIG_CHANGED)

                )

            }



            // WHEN collection starts AFTER the broadcast is sent out

            val latest by collectLastValue(underTest.defaultDataSubRatConfig)



            // THEN the config has the updated value

            assertThat(latest!!.areEqual(configFromContext)).isTrue()

            assertThat(latest!!.showAtLeast3G).isTrue()

        }



    @Test

    fun activeDataChange_inSameGroup_emitsUnit() =

        testScope.runTest {