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

Commit fde7a7db authored by Nicolò Mazzucato's avatar Nicolò Mazzucato Committed by Android (Google) Code Review
Browse files

Merge changes Ibac62793,I45260817 into main 

* changes:
  Convert enableDisplays to a StateFlow in the background
  Introduce @Background CoroutineScope
parents 686b0764 021c1a9a

packages/SystemUI/src/com/android/systemui/display/data/repository/DisplayRepository.kt

+3 −6
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import com.android.app.tracing.FlowTracing.traceEach 
import com.android.app.tracing.traceSection

import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.dagger.qualifiers.Background

import com.android.systemui.display.data.DisplayEvent

import com.android.systemui.util.Compile
@@ -93,7 +92,7 @@ class DisplayRepositoryImpl 
constructor(

    private val displayManager: DisplayManager,

    @Background backgroundHandler: Handler,

    @Application applicationScope: CoroutineScope,

    @Background bgApplicationScope: CoroutineScope,

    @Background backgroundCoroutineDispatcher: CoroutineDispatcher

) : DisplayRepository {

    private val allDisplayEvents: Flow<DisplayEvent> =
@@ -141,8 +140,7 @@ constructor( 
    private val enabledDisplays =

        allDisplayEvents

            .map { getDisplays() }

            .flowOn(backgroundCoroutineDispatcher)

            .shareIn(applicationScope, started = SharingStarted.WhileSubscribed(), replay = 1)

            .shareIn(bgApplicationScope, started = SharingStarted.WhileSubscribed(), replay = 1)



    override val displays: Flow<Set<Display>> = enabledDisplays
@@ -203,9 +201,8 @@ constructor( 
            }

            .distinctUntilChanged()

            .debugLog("connectedDisplayIds")

            .flowOn(backgroundCoroutineDispatcher)

            .stateIn(

                applicationScope,

                bgApplicationScope,

                started = SharingStarted.WhileSubscribed(),

                // The initial value is set to empty, but connected displays are gathered as soon as

                // the flow starts being collected. This is to ensure the call to get displays (an

packages/SystemUI/src/com/android/systemui/util/kotlin/CoroutinesModule.kt

+9 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ import kotlinx.coroutines.CoroutineDispatcher 
import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.Dispatchers

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.plus

import kotlin.coroutines.CoroutineContext

import kotlin.coroutines.EmptyCoroutineContext
@@ -27,6 +28,14 @@ class CoroutinesModule { 
            @Main dispatcherContext: CoroutineContext,

    ): CoroutineScope = CoroutineScope(dispatcherContext)



    @Provides

    @SysUISingleton

    @Background

    fun bgApplicationScope(

            @Application applicationScope: CoroutineScope,

            @Background coroutineContext: CoroutineContext,

    ): CoroutineScope = applicationScope.plus(coroutineContext)



    @Provides

    @SysUISingleton

    @Main