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

Commit ff4d036b authored by Nicolo' Mazzucato's avatar Nicolo' Mazzucato
Browse files

Avoid logging shade display if the flag is disabled 

This prevents ShadeDisplayRepository from being initialized if the flag is disabled.

Bug: 362719719
Test: no crash in presubmits
Flag: com.android.systemui.shade_window_goes_around
Change-Id: I331d8d7035ebb45d6f85744dbde49d2fad1cd76c
parent f71aa0da

packages/SystemUI/src/com/android/systemui/shade/ShadeStateTraceLogger.kt

+8 −4
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ import com.android.systemui.dagger.SysUISingleton 
import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.shade.data.repository.ShadeDisplaysRepository

import com.android.systemui.shade.domain.interactor.ShadeInteractor

import com.android.systemui.shade.shared.flag.ShadeWindowGoesAround

import dagger.Lazy

import javax.inject.Inject

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.launch
@@ -34,7 +36,7 @@ class ShadeStateTraceLogger 
@Inject

constructor(

    private val shadeInteractor: ShadeInteractor,

    private val shadeDisplaysRepository: ShadeDisplaysRepository,

    private val shadeDisplaysRepository: Lazy<ShadeDisplaysRepository>,

    @Application private val scope: CoroutineScope,

) : CoreStartable {

    override fun start() {
@@ -52,13 +54,15 @@ constructor( 
                    instantForGroup(TRACK_GROUP_NAME, "shadeExpansion", it)

                }

            }

            if (ShadeWindowGoesAround.isEnabled) {

                launch {

                shadeDisplaysRepository.displayId.collect {

                    shadeDisplaysRepository.get().displayId.collect {

                        instantForGroup(TRACK_GROUP_NAME, "displayId", it)

                    }

                }

            }

        }

    }



    private fun createTraceStateLogger(trackName: String): TraceStateLogger {

        return TraceStateLogger(trackGroup(TRACK_GROUP_NAME, trackName))