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

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

Merge "Coroutine tracing improvements" into main

parents 9e65fb47 ee47f86b

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/notification/stack/ui/viewmodel/NotificationListViewModelTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ package com.android.systemui.statusbar.notification.stack.ui.viewmodel 
import android.platform.test.annotations.EnableFlags

import android.platform.test.flag.junit.FlagsParameterization

import androidx.test.filters.SmallTest

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

import com.android.systemui.SysuiTestCase

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.flags.DisableSceneContainer
@@ -51,6 +50,7 @@ import com.android.systemui.util.ui.isAnimating 
import com.android.systemui.util.ui.value

import com.google.common.truth.Truth.assertThat

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.flow.map

import kotlinx.coroutines.test.TestScope

import kotlinx.coroutines.test.runCurrent

import kotlinx.coroutines.test.runTest

packages/SystemUI/src/com/android/systemui/bouncer/ui/viewmodel/AuthMethodBouncerViewModel.kt

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.systemui.bouncer.ui.viewmodel



import android.annotation.StringRes

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

import com.android.systemui.authentication.domain.interactor.AuthenticationResult

import com.android.systemui.authentication.shared.model.AuthenticationMethodModel

import com.android.systemui.bouncer.domain.interactor.BouncerInteractor
@@ -28,6 +27,7 @@ import kotlinx.coroutines.channels.Channel 
import kotlinx.coroutines.flow.MutableStateFlow

import kotlinx.coroutines.flow.StateFlow

import kotlinx.coroutines.flow.asStateFlow

import kotlinx.coroutines.flow.collectLatest

import kotlinx.coroutines.flow.receiveAsFlow



sealed class AuthMethodBouncerViewModel(

packages/SystemUI/src/com/android/systemui/common/usagestats/data/repository/UsageStatsRepository.kt

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package com.android.systemui.common.usagestats.data.repository 
import android.app.usage.UsageEvents

import android.app.usage.UsageEventsQuery

import android.app.usage.UsageStatsManager

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

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

import com.android.systemui.common.usagestats.data.model.UsageStatsQuery

import com.android.systemui.common.usagestats.shared.model.ActivityEventModel

import com.android.systemui.common.usagestats.shared.model.ActivityEventModel.Lifecycle

packages/SystemUI/src/com/android/systemui/communal/domain/interactor/CommunalInteractor.kt

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import android.content.pm.UserInfo 
import android.os.UserHandle

import android.os.UserManager

import android.provider.Settings

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

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

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

import com.android.compose.animation.scene.SceneKey

import com.android.compose.animation.scene.TransitionKey

packages/SystemUI/src/com/android/systemui/communal/domain/interactor/CommunalSceneInteractor.kt

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.systemui.communal.domain.interactor



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

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

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

import com.android.compose.animation.scene.SceneKey

import com.android.compose.animation.scene.TransitionKey