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

Commit 0f5d54ed authored by Justin Weir's avatar Justin Weir
Browse files

Use filteredSubscriptions in isSingleCarrier 

See b/427212613#comment35 for details

Bug: 427212613
Test: Manual verification and ran affected tests
Test: Added a test that fails without this change
Flag: EXEMPT bug fix
Change-Id: I8011ef963f8b64e7598a267f2321654ab589174a
parent 49c6da52

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconsInteractorTest.kt

+19 −0
Original line number Diff line number Diff line
@@ -710,6 +710,25 @@ abstract class MobileIconsInteractorTestBase : SysuiTestCase() { 
            assertThat(latest).isFalse()

        }



    @Test

    fun isSingleCarrier_twoOpportunisticSubscriptions_true() =

        kosmos.runTest {

            val latest by collectLastValue(underTest.isSingleCarrier)



            val (sub3, sub4) =

                createSubscriptionPair(

                    subscriptionIds = Pair(SUB_3_ID, SUB_4_ID),

                    opportunistic = Pair(true, true),

                    grouped = true,

                )

            connectionsRepository.setSubscriptions(listOf(sub3, sub4))

            connectionsRepository.setActiveMobileDataSubscriptionId(SUB_3_ID)

            whenever(carrierConfigTracker.alwaysShowPrimarySignalBarInOpportunisticNetworkDefault)

                .thenReturn(false)



            assertThat(latest).isEqualTo(true)

        }



    @Test

    fun isSingleCarrier_updates() =

        kosmos.runTest {

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconsInteractor.kt

+1 −1
Original line number Diff line number Diff line
@@ -376,7 +376,7 @@ constructor( 
            .stateIn(scope, SharingStarted.WhileSubscribed(), false)



    override val isSingleCarrier: StateFlow<Boolean> =

        mobileConnectionsRepo.subscriptions

        filteredSubscriptions

            .map { it.size == 1 }

            .logDiffsForTable(

                tableLogger,

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/domain/interactor/MobileIconsInteractorKairos.kt

+1 −1
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ constructor( 
        mobileConnectionsRepo.defaultDataSubRatConfig.map { it.alwaysShowCdmaRssi }



    override val isSingleCarrier: State<Boolean> =

        mobileConnectionsRepo.subscriptions

        filteredSubscriptions

            .map { it.size == 1 }

            .also {

                onActivated {