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

Commit 4f0b40e1 authored by Anton Potapov's avatar Anton Potapov
Browse files

Fix injecting custom buffers into QSTileLogger 

Test: atest QSTileLoggerTest
Flag: LEGACY QS_PIPELINE_NEW_TILES DISABLED
Bug: 299908705
Change-Id: I29c1ac1b3dbb0a5a89006d7ba2e13d91dcf14729
parent 7a17d789

packages/SystemUI/src/com/android/systemui/qs/tiles/base/logging/QSTileLogger.kt

+4 −12
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ import com.android.systemui.log.core.LogLevel 
import com.android.systemui.log.dagger.QSTilesLogBuffers

import com.android.systemui.plugins.statusbar.StatusBarStateController

import com.android.systemui.qs.pipeline.shared.TileSpec

import com.android.systemui.qs.tiles.base.interactor.DataUpdateTrigger

import com.android.systemui.qs.tiles.viewmodel.QSTileState

import com.android.systemui.qs.tiles.viewmodel.QSTileUserAction

import com.android.systemui.statusbar.StatusBarState
@@ -34,7 +33,7 @@ import javax.inject.Inject 
class QSTileLogger

@Inject

constructor(

    @QSTilesLogBuffers logBuffers: Map<TileSpec, LogBuffer>,

    @QSTilesLogBuffers logBuffers: Map<String, LogBuffer>,

    private val factory: LogBufferFactory,

    private val mStatusBarStateController: StatusBarStateController,

) {
@@ -163,22 +162,15 @@ constructor( 


    private fun TileSpec.getLogBuffer(): LogBuffer =

        synchronized(logBufferCache) {

            logBufferCache.getOrPut(this) {

            logBufferCache.getOrPut(this.spec) {

                factory.create(

                    "QSTileLog_${this.getLogTag()}",

                    this.getLogTag(),

                    BUFFER_MAX_SIZE /* maxSize */,

                    false /* systrace */

                )

            }

        }



    private fun DataUpdateTrigger.toLogString(): String =

        when (this) {

            is DataUpdateTrigger.ForceUpdate -> "force"

            is DataUpdateTrigger.InitialRequest -> "init"

            is DataUpdateTrigger.UserInput<*> -> input.action.toLogString()

        }



    private fun QSTileUserAction.toLogString(): String =

        when (this) {

            is QSTileUserAction.Click -> "click"
@@ -198,7 +190,7 @@ constructor( 
            "]"



    private companion object {

        const val TAG_FORMAT_PREFIX = "QSLog"

        const val TAG_FORMAT_PREFIX = "QSLog_tile_"

        const val DATA_MAX_LENGTH = 50

        const val BUFFER_MAX_SIZE = 25

    }

packages/SystemUI/tests/src/com/android/systemui/qs/tiles/base/logging/QSTileLoggerTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ class QSTileLoggerTest : SysuiTestCase() { 
        whenever(logBufferFactory.create(any(), any(), any())).thenReturn(logBuffer)

        underTest =

            QSTileLogger(

                mapOf(TileSpec.create("chatty_tile") to chattyLogBuffer),

                mapOf("chatty_tile" to chattyLogBuffer),

                logBufferFactory,

                statusBarController

            )