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

Commit 59ca8306 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update ktf flow tracing" into main

parents 03eedf01 8a4042e9

packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardTransitionRepository.kt

+7 −6
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ import android.annotation.SuppressLint 
import android.os.Trace

import android.util.Log

import com.android.app.animation.Interpolators

import com.android.app.tracing.coroutines.flow.traceAs

import com.android.app.tracing.coroutines.withContextTraced as withContext

import com.android.systemui.Flags.transitionRaceCondition

import com.android.systemui.dagger.SysUISingleton
@@ -43,7 +44,6 @@ import kotlinx.coroutines.flow.Flow 
import kotlinx.coroutines.flow.MutableSharedFlow

import kotlinx.coroutines.flow.MutableStateFlow

import kotlinx.coroutines.flow.StateFlow

import kotlinx.coroutines.flow.asSharedFlow

import kotlinx.coroutines.flow.asStateFlow

import kotlinx.coroutines.flow.distinctUntilChanged

import kotlinx.coroutines.flow.filter
@@ -147,7 +147,8 @@ constructor( 
                extraBufferCapacity = 20,

                onBufferOverflow = BufferOverflow.DROP_OLDEST,

            )

    override val transitions = _transitions.asSharedFlow().distinctUntilChanged()

            .traceAs("KTR-transitions")

    override val transitions = _transitions.distinctUntilChanged()

    private var lastStep: TransitionStep = TransitionStep()

    private var lastAnimator: ValueAnimator? = null

    private var animatorListener: AnimatorListenerAdapter? = null

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/KeyguardTransitionInteractor.kt

+7 −4
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ package com.android.systemui.keyguard.domain.interactor 


import android.annotation.SuppressLint

import android.util.Log

import com.android.app.tracing.coroutines.flow.traceAs

import com.android.app.tracing.coroutines.launchTraced as launch

import com.android.compose.animation.scene.ObservableTransitionState

import com.android.compose.animation.scene.SceneKey
@@ -90,6 +91,7 @@ constructor( 
                    onBufferOverflow = BufferOverflow.DROP_OLDEST,

                )

                .also { it.tryEmit(0f) }

                .traceAs("KTF-${state.name}")

        }

    }
@@ -222,10 +224,11 @@ constructor( 


        val flow: Flow<TransitionStep> =

            transitionMap.getOrPut(mappedEdge) {

                MutableSharedFlow(

                MutableSharedFlow<TransitionStep>(

                        extraBufferCapacity = 10,

                        onBufferOverflow = BufferOverflow.DROP_OLDEST,

                    )

                    .traceAs("KTF-${mappedEdge.from}-to-${mappedEdge.to}")

            }



        if (!SceneContainerFlag.isEnabled) {