diff options
5 files changed, 11 insertions, 10 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/doze/DozeMachine.java b/packages/SystemUI/src/com/android/systemui/doze/DozeMachine.java index e02e3fbc339b..10f060c13a59 100644 --- a/packages/SystemUI/src/com/android/systemui/doze/DozeMachine.java +++ b/packages/SystemUI/src/com/android/systemui/doze/DozeMachine.java @@ -22,10 +22,10 @@ import static com.android.systemui.keyguard.WakefulnessLifecycle.WAKEFULNESS_WAK import android.annotation.MainThread; import android.content.res.Configuration; import android.hardware.display.AmbientDisplayConfiguration; -import android.os.Trace; import android.util.Log; import android.view.Display; +import com.android.app.tracing.coroutines.TrackTracer; import com.android.internal.util.Preconditions; import com.android.systemui.dock.DockManager; import com.android.systemui.doze.dagger.DozeScope; @@ -314,7 +314,7 @@ public class DozeMachine { mState = newState; mDozeLog.traceState(newState); - Trace.traceCounter(Trace.TRACE_TAG_APP, "doze_machine_state", newState.ordinal()); + TrackTracer.instantForGroup("keyguard", "doze_machine_state", newState.ordinal()); updatePulseReason(newState, oldState, pulseReason); performTransitionOnComponents(oldState, newState); diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java index 63ac5094c400..e65cd9873491 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -109,6 +109,7 @@ import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import com.android.app.animation.Interpolators; +import com.android.app.tracing.coroutines.TrackTracer; import com.android.internal.foldables.FoldGracePeriodProvider; import com.android.internal.jank.InteractionJankMonitor; import com.android.internal.jank.InteractionJankMonitor.Configuration; @@ -3983,7 +3984,7 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable, public void setPendingLock(boolean hasPendingLock) { mPendingLock = hasPendingLock; - Trace.traceCounter(Trace.TRACE_TAG_APP, "pendingLock", mPendingLock ? 1 : 0); + TrackTracer.instantForGroup("keyguard", "pendingLock", mPendingLock ? 1 : 0); } private boolean isViewRootReady() { diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/ScreenLifecycle.java b/packages/SystemUI/src/com/android/systemui/keyguard/ScreenLifecycle.java index 633628f1167e..c3182003227f 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/ScreenLifecycle.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/ScreenLifecycle.java @@ -16,8 +16,7 @@ package com.android.systemui.keyguard; -import android.os.Trace; - +import com.android.app.tracing.coroutines.TrackTracer; import com.android.systemui.Dumpable; import com.android.systemui.dump.DumpManager; import com.android.systemui.power.domain.interactor.PowerInteractor; @@ -80,7 +79,7 @@ public class ScreenLifecycle extends Lifecycle<ScreenLifecycle.Observer> impleme private void setScreenState(int screenState) { mScreenState = screenState; - Trace.traceCounter(Trace.TRACE_TAG_APP, "screenState", screenState); + TrackTracer.instantForGroup("screen", "screenState", screenState); } public interface Observer { diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/WakefulnessLifecycle.java b/packages/SystemUI/src/com/android/systemui/keyguard/WakefulnessLifecycle.java index c0ffda6640b2..c261cfefb2b8 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/WakefulnessLifecycle.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/WakefulnessLifecycle.java @@ -24,11 +24,11 @@ import android.graphics.Point; import android.os.Bundle; import android.os.PowerManager; import android.os.RemoteException; -import android.os.Trace; import android.util.DisplayMetrics; import androidx.annotation.Nullable; +import com.android.app.tracing.coroutines.TrackTracer; import com.android.systemui.Dumpable; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dump.DumpManager; @@ -197,7 +197,7 @@ public class WakefulnessLifecycle extends Lifecycle<WakefulnessLifecycle.Observe private void setWakefulness(@Wakefulness int wakefulness) { mWakefulness = wakefulness; - Trace.traceCounter(Trace.TRACE_TAG_APP, "wakefulness", wakefulness); + TrackTracer.instantForGroup("screen", "wakefulness", wakefulness); } private void updateLastWakeOriginLocation() { diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java index 31cae79c6b94..81d06a8db0b6 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/KeyguardStateControllerImpl.java @@ -32,6 +32,7 @@ import android.os.Trace; import androidx.annotation.VisibleForTesting; +import com.android.app.tracing.coroutines.TrackTracer; import com.android.internal.widget.LockPatternUtils; import com.android.keyguard.KeyguardUpdateMonitor; import com.android.keyguard.KeyguardUpdateMonitorCallback; @@ -241,7 +242,7 @@ public class KeyguardStateControllerImpl implements KeyguardStateController { private void setKeyguardFadingAway(boolean keyguardFadingAway) { if (mKeyguardFadingAway != keyguardFadingAway) { - Trace.traceCounter(Trace.TRACE_TAG_APP, "keyguardFadingAway", + TrackTracer.instantForGroup("keyguard", "FadingAway", keyguardFadingAway ? 1 : 0); mKeyguardFadingAway = keyguardFadingAway; invokeForEachCallback(Callback::onKeyguardFadingAwayChanged); @@ -356,7 +357,7 @@ public class KeyguardStateControllerImpl implements KeyguardStateController { @Override public void notifyKeyguardGoingAway(boolean keyguardGoingAway) { if (mKeyguardGoingAway != keyguardGoingAway) { - Trace.traceCounter(Trace.TRACE_TAG_APP, "keyguardGoingAway", + Trace.traceCounter(Trace.TRACE_TAG_APP, "keyguard##GoingAway", keyguardGoingAway ? 1 : 0); mKeyguardGoingAway = keyguardGoingAway; mKeyguardInteractorLazy.get().setIsKeyguardGoingAway(keyguardGoingAway); |