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

Commit 021d5226 authored by Evan Laird's avatar Evan Laird Committed by Automerger Merge Worker
Browse files

Merge "[Sb refactor] Ensure we fetch default data subId on flow start" into udc-dev am: ea99cd58 

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



Change-Id: If150a1c00fe8d48524c9346080a278105b103812
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1d5df87a ea99cd58

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/dagger/StatusBarPipelineModule.kt

+8 −2
Original line number Original line Diff line number Diff line
@@ -37,6 +37,8 @@ import com.android.systemui.statusbar.pipeline.mobile.domain.interactor.MobileIc 
import com.android.systemui.statusbar.pipeline.mobile.ui.MobileUiAdapter

import com.android.systemui.statusbar.pipeline.mobile.ui.MobileUiAdapter

import com.android.systemui.statusbar.pipeline.mobile.util.MobileMappingsProxy

import com.android.systemui.statusbar.pipeline.mobile.util.MobileMappingsProxy

import com.android.systemui.statusbar.pipeline.mobile.util.MobileMappingsProxyImpl

import com.android.systemui.statusbar.pipeline.mobile.util.MobileMappingsProxyImpl

import com.android.systemui.statusbar.pipeline.mobile.util.SubscriptionManagerProxy

import com.android.systemui.statusbar.pipeline.mobile.util.SubscriptionManagerProxyImpl

import com.android.systemui.statusbar.pipeline.shared.data.repository.ConnectivityRepository

import com.android.systemui.statusbar.pipeline.shared.data.repository.ConnectivityRepository

import com.android.systemui.statusbar.pipeline.shared.data.repository.ConnectivityRepositoryImpl

import com.android.systemui.statusbar.pipeline.shared.data.repository.ConnectivityRepositoryImpl

import com.android.systemui.statusbar.pipeline.wifi.data.repository.RealWifiRepository

import com.android.systemui.statusbar.pipeline.wifi.data.repository.RealWifiRepository
@@ -65,8 +67,7 @@ abstract class StatusBarPipelineModule { 




    @Binds abstract fun wifiRepository(impl: WifiRepositorySwitcher): WifiRepository

    @Binds abstract fun wifiRepository(impl: WifiRepositorySwitcher): WifiRepository





    @Binds

    @Binds abstract fun wifiInteractor(impl: WifiInteractorImpl): WifiInteractor

    abstract fun wifiInteractor(impl: WifiInteractorImpl): WifiInteractor





    @Binds

    @Binds

    abstract fun mobileConnectionsRepository(

    abstract fun mobileConnectionsRepository(
@@ -77,6 +78,11 @@ abstract class StatusBarPipelineModule { 




    @Binds abstract fun mobileMappingsProxy(impl: MobileMappingsProxyImpl): MobileMappingsProxy

    @Binds abstract fun mobileMappingsProxy(impl: MobileMappingsProxyImpl): MobileMappingsProxy





    @Binds

    abstract fun subscriptionManagerProxy(

        impl: SubscriptionManagerProxyImpl

    ): SubscriptionManagerProxy



    @Binds

    @Binds

    abstract fun mobileIconsInteractor(impl: MobileIconsInteractorImpl): MobileIconsInteractor

    abstract fun mobileIconsInteractor(impl: MobileIconsInteractorImpl): MobileIconsInteractor

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

+7 −7
Original line number Original line Diff line number Diff line
@@ -44,6 +44,7 @@ import com.android.systemui.statusbar.pipeline.mobile.data.model.NetworkNameMode 
import com.android.systemui.statusbar.pipeline.mobile.data.model.SubscriptionModel

import com.android.systemui.statusbar.pipeline.mobile.data.model.SubscriptionModel

import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionsRepository

import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionsRepository

import com.android.systemui.statusbar.pipeline.mobile.util.MobileMappingsProxy

import com.android.systemui.statusbar.pipeline.mobile.util.MobileMappingsProxy

import com.android.systemui.statusbar.pipeline.mobile.util.SubscriptionManagerProxy

import com.android.systemui.statusbar.pipeline.shared.data.repository.ConnectivityRepository

import com.android.systemui.statusbar.pipeline.shared.data.repository.ConnectivityRepository

import com.android.systemui.statusbar.pipeline.wifi.data.repository.WifiRepository

import com.android.systemui.statusbar.pipeline.wifi.data.repository.WifiRepository

import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiNetworkModel

import com.android.systemui.statusbar.pipeline.wifi.shared.model.WifiNetworkModel
@@ -65,6 +66,7 @@ import kotlinx.coroutines.flow.mapLatest 
import kotlinx.coroutines.flow.mapNotNull

import kotlinx.coroutines.flow.mapNotNull

import kotlinx.coroutines.flow.merge

import kotlinx.coroutines.flow.merge

import kotlinx.coroutines.flow.onEach

import kotlinx.coroutines.flow.onEach

import kotlinx.coroutines.flow.onStart

import kotlinx.coroutines.flow.stateIn

import kotlinx.coroutines.flow.stateIn

import kotlinx.coroutines.withContext

import kotlinx.coroutines.withContext
@@ -76,6 +78,7 @@ class MobileConnectionsRepositoryImpl 
constructor(

constructor(

    connectivityRepository: ConnectivityRepository,

    connectivityRepository: ConnectivityRepository,

    private val subscriptionManager: SubscriptionManager,

    private val subscriptionManager: SubscriptionManager,

    private val subscriptionManagerProxy: SubscriptionManagerProxy,

    private val telephonyManager: TelephonyManager,

    private val telephonyManager: TelephonyManager,

    private val logger: MobileInputLogger,

    private val logger: MobileInputLogger,

    @MobileSummaryLog private val tableLogger: TableLogBuffer,

    @MobileSummaryLog private val tableLogger: TableLogBuffer,
@@ -195,7 +198,7 @@ constructor( 
    override val defaultDataSubId: StateFlow<Int> =

    override val defaultDataSubId: StateFlow<Int> =

        broadcastDispatcher

        broadcastDispatcher

            .broadcastFlow(

            .broadcastFlow(

                IntentFilter(TelephonyManager.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED)

                IntentFilter(TelephonyManager.ACTION_DEFAULT_DATA_SUBSCRIPTION_CHANGED),

            ) { intent, _ ->

            ) { intent, _ ->

                intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY, INVALID_SUBSCRIPTION_ID)

                intent.getIntExtra(PhoneConstants.SUBSCRIPTION_KEY, INVALID_SUBSCRIPTION_ID)

            }

            }
@@ -204,14 +207,11 @@ constructor( 
                tableLogger,

                tableLogger,

                LOGGING_PREFIX,

                LOGGING_PREFIX,

                columnName = "defaultSubId",

                columnName = "defaultSubId",

                initialValue = SubscriptionManager.getDefaultDataSubscriptionId(),

                initialValue = INVALID_SUBSCRIPTION_ID,

            )

            )

            .onStart { emit(subscriptionManagerProxy.getDefaultDataSubscriptionId()) }

            .onEach { defaultDataSubIdChangeEvent.tryEmit(Unit) }

            .onEach { defaultDataSubIdChangeEvent.tryEmit(Unit) }

            .stateIn(

            .stateIn(scope, SharingStarted.WhileSubscribed(), INVALID_SUBSCRIPTION_ID)

                scope,

                SharingStarted.WhileSubscribed(),

                SubscriptionManager.getDefaultDataSubscriptionId()

            )





    private val carrierConfigChangedEvent =

    private val carrierConfigChangedEvent =

        broadcastDispatcher

        broadcastDispatcher

packages/SystemUI/src/com/android/systemui/statusbar/pipeline/mobile/util/SubscriptionManagerProxy.kt

0 → 100644
+30 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.statusbar.pipeline.mobile.util



import android.telephony.SubscriptionManager

import javax.inject.Inject



interface SubscriptionManagerProxy {

    fun getDefaultDataSubscriptionId(): Int

}



/** Injectable proxy class for [SubscriptionManager]'s static methods */

class SubscriptionManagerProxyImpl @Inject constructor() : SubscriptionManagerProxy {

    /** The system default data subscription id, or INVALID_SUBSCRIPTION_ID on error */

    override fun getDefaultDataSubscriptionId() = SubscriptionManager.getDefaultDataSubscriptionId()

}

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

+3 −0
Original line number Original line Diff line number Diff line
@@ -34,6 +34,7 @@ import com.android.systemui.statusbar.pipeline.mobile.data.repository.demo.model 
import com.android.systemui.statusbar.pipeline.mobile.data.repository.demo.validMobileEvent

import com.android.systemui.statusbar.pipeline.mobile.data.repository.demo.validMobileEvent

import com.android.systemui.statusbar.pipeline.mobile.data.repository.prod.MobileConnectionsRepositoryImpl

import com.android.systemui.statusbar.pipeline.mobile.data.repository.prod.MobileConnectionsRepositoryImpl

import com.android.systemui.statusbar.pipeline.mobile.util.FakeMobileMappingsProxy

import com.android.systemui.statusbar.pipeline.mobile.util.FakeMobileMappingsProxy

import com.android.systemui.statusbar.pipeline.mobile.util.FakeSubscriptionManagerProxy

import com.android.systemui.statusbar.pipeline.shared.data.repository.ConnectivityRepository

import com.android.systemui.statusbar.pipeline.shared.data.repository.ConnectivityRepository

import com.android.systemui.statusbar.pipeline.shared.data.repository.FakeConnectivityRepository

import com.android.systemui.statusbar.pipeline.shared.data.repository.FakeConnectivityRepository

import com.android.systemui.statusbar.pipeline.wifi.data.repository.FakeWifiRepository

import com.android.systemui.statusbar.pipeline.wifi.data.repository.FakeWifiRepository
@@ -89,6 +90,7 @@ class MobileRepositorySwitcherTest : SysuiTestCase() { 




    private val fakeNetworkEventsFlow = MutableStateFlow<FakeNetworkEventModel?>(null)

    private val fakeNetworkEventsFlow = MutableStateFlow<FakeNetworkEventModel?>(null)

    private val mobileMappings = FakeMobileMappingsProxy()

    private val mobileMappings = FakeMobileMappingsProxy()

    private val subscriptionManagerProxy = FakeSubscriptionManagerProxy()





    private val scope = CoroutineScope(IMMEDIATE)

    private val scope = CoroutineScope(IMMEDIATE)
@@ -117,6 +119,7 @@ class MobileRepositorySwitcherTest : SysuiTestCase() { 
            MobileConnectionsRepositoryImpl(

            MobileConnectionsRepositoryImpl(

                connectivityRepository,

                connectivityRepository,

                subscriptionManager,

                subscriptionManager,

                subscriptionManagerProxy,

                telephonyManager,

                telephonyManager,

                logger,

                logger,

                summaryLogger,

                summaryLogger,

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

+42 −0
Original line number Original line Diff line number Diff line
@@ -47,6 +47,7 @@ import com.android.systemui.statusbar.pipeline.mobile.data.repository.CarrierCon 
import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionRepository

import com.android.systemui.statusbar.pipeline.mobile.data.repository.MobileConnectionRepository

import com.android.systemui.statusbar.pipeline.mobile.data.repository.prod.FullMobileConnectionRepository.Factory.Companion.tableBufferLogName

import com.android.systemui.statusbar.pipeline.mobile.data.repository.prod.FullMobileConnectionRepository.Factory.Companion.tableBufferLogName

import com.android.systemui.statusbar.pipeline.mobile.util.FakeMobileMappingsProxy

import com.android.systemui.statusbar.pipeline.mobile.util.FakeMobileMappingsProxy

import com.android.systemui.statusbar.pipeline.mobile.util.FakeSubscriptionManagerProxy

import com.android.systemui.statusbar.pipeline.shared.data.model.ConnectivitySlots

import com.android.systemui.statusbar.pipeline.shared.data.model.ConnectivitySlots

import com.android.systemui.statusbar.pipeline.shared.data.repository.ConnectivityRepository

import com.android.systemui.statusbar.pipeline.shared.data.repository.ConnectivityRepository

import com.android.systemui.statusbar.pipeline.shared.data.repository.ConnectivityRepositoryImpl

import com.android.systemui.statusbar.pipeline.shared.data.repository.ConnectivityRepositoryImpl
@@ -98,6 +99,7 @@ class MobileConnectionsRepositoryTest : SysuiTestCase() { 
    @Mock private lateinit var logBufferFactory: TableLogBufferFactory

    @Mock private lateinit var logBufferFactory: TableLogBufferFactory





    private val mobileMappings = FakeMobileMappingsProxy()

    private val mobileMappings = FakeMobileMappingsProxy()

    private val subscriptionManagerProxy = FakeSubscriptionManagerProxy()





    private val scope = CoroutineScope(IMMEDIATE)

    private val scope = CoroutineScope(IMMEDIATE)
@@ -179,6 +181,7 @@ class MobileConnectionsRepositoryTest : SysuiTestCase() { 
            MobileConnectionsRepositoryImpl(

            MobileConnectionsRepositoryImpl(

                connectivityRepository,

                connectivityRepository,

                subscriptionManager,

                subscriptionManager,

                subscriptionManagerProxy,

                telephonyManager,

                telephonyManager,

                logger,

                logger,

                summaryLogger,

                summaryLogger,
@@ -662,6 +665,8 @@ class MobileConnectionsRepositoryTest : SysuiTestCase() { 
            var latest: Int? = null

            var latest: Int? = null

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

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





            assertThat(latest).isEqualTo(INVALID_SUBSCRIPTION_ID)



            fakeBroadcastDispatcher.registeredReceivers.forEach { receiver ->

            fakeBroadcastDispatcher.registeredReceivers.forEach { receiver ->

                receiver.onReceive(

                receiver.onReceive(

                    context,

                    context,
@@ -685,6 +690,42 @@ class MobileConnectionsRepositoryTest : SysuiTestCase() { 
            job.cancel()

            job.cancel()

        }

        }





    @Test

    fun defaultDataSubId_fetchesInitialValueOnStart() =

        runBlocking(IMMEDIATE) {

            subscriptionManagerProxy.defaultDataSubId = 2

            var latest: Int? = null

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



            assertThat(latest).isEqualTo(2)



            job.cancel()

        }



    @Test

    fun defaultDataSubId_fetchesCurrentOnRestart() =

        runBlocking(IMMEDIATE) {

            subscriptionManagerProxy.defaultDataSubId = 2

            var latest: Int? = null

            var job = underTest.defaultDataSubId.onEach { latest = it }.launchIn(this)



            assertThat(latest).isEqualTo(2)



            job.cancel()



            // Collectors go away but come back later



            latest = null



            subscriptionManagerProxy.defaultDataSubId = 1



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



            assertThat(latest).isEqualTo(1)



            job.cancel()

        }



    @Test

    @Test

    fun mobileIsDefault_startsAsFalse() {

    fun mobileIsDefault_startsAsFalse() {

        assertThat(underTest.mobileIsDefault.value).isFalse()

        assertThat(underTest.mobileIsDefault.value).isFalse()
@@ -902,6 +943,7 @@ class MobileConnectionsRepositoryTest : SysuiTestCase() { 
                MobileConnectionsRepositoryImpl(

                MobileConnectionsRepositoryImpl(

                    connectivityRepository,

                    connectivityRepository,

                    subscriptionManager,

                    subscriptionManager,

                    subscriptionManagerProxy,

                    telephonyManager,

                    telephonyManager,

                    logger,

                    logger,

                    summaryLogger,

                    summaryLogger,