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

Commit a1dac22b authored by Peter Kalauskas's avatar Peter Kalauskas Committed by Automerger Merge Worker
Browse files

Merge "Fix coroutine tracing imports" into main am: 7a5936d0 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3336257



Change-Id: Idb62cc51916b682e6a07423bd079ea76778c2cd9
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1b01eeee 7a5936d0

packages/SystemUI/src/com/android/systemui/keyguard/CustomizationProvider.kt

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import android.net.Uri 
import android.os.Binder

import android.os.Bundle

import android.util.Log

import com.android.app.tracing.coroutines.runBlocking

import com.android.app.tracing.coroutines.runBlockingTraced as runBlocking

import com.android.systemui.SystemUIAppComponentFactoryBase

import com.android.systemui.SystemUIAppComponentFactoryBase.ContextAvailableCallback

import com.android.systemui.dagger.qualifiers.Main

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

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import android.annotation.FloatRange 
import android.annotation.SuppressLint

import android.os.Trace

import android.util.Log

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

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

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Main

import com.android.systemui.keyguard.shared.model.KeyguardState

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

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.systemui.keyguard.domain.interactor 


import android.animation.ValueAnimator

import com.android.app.animation.Interpolators

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

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

import com.android.systemui.dagger.SysUISingleton

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

import com.android.systemui.dagger.qualifiers.Main

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

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.systemui.keyguard.domain.interactor 


import android.animation.ValueAnimator

import com.android.app.animation.Interpolators

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

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

import com.android.systemui.Flags.communalHub

import com.android.systemui.dagger.SysUISingleton

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

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

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.systemui.keyguard.domain.interactor 


import android.animation.ValueAnimator

import com.android.app.animation.Interpolators

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

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

import com.android.systemui.Flags

import com.android.systemui.dagger.SysUISingleton

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