Merge "Prefix UI Tracing slices to have a common "UiTracing::" prefix" into main (b163ba01) · Commits · e / os / android_frameworks_base

core/java/android/tracing/TracingUtils.java

0 → 100644

+28 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2025 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.tracing;

		/**
		* Helper class to store helper methods for tracing.
		*
		* @hide
		*/
		public class TracingUtils {
		public static String uiTracingSliceName(String name) {
		return "UiTracing::" + name;
		}
		}

libs/WindowManager/Shell/src/com/android/wm/shell/transition/tracing/PerfettoTransitionTracer.java

+9 −4

Original line number	Diff line number	Diff line
		@@ -24,6 +24,7 @@ import android.internal.perfetto.protos.ShellTransitionOuterClass.ShellTransitio
		import android.internal.perfetto.protos.TracePacketOuterClass.TracePacket;
		import android.os.SystemClock;
		import android.os.Trace;
		import android.tracing.TracingUtils;
		import android.tracing.perfetto.DataSourceParams;
		import android.tracing.perfetto.InitArguments;
		import android.tracing.perfetto.Producer;
		@@ -69,7 +70,8 @@ public class PerfettoTransitionTracer implements TransitionTracer {
		return;
		}

		Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "logDispatched");
		Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER,
		TracingUtils.uiTracingSliceName("Transition::logDispatched"));
		try {
		doLogDispatched(transitionId, handler);
		} finally {
		@@ -116,7 +118,8 @@ public class PerfettoTransitionTracer implements TransitionTracer {
		return;
		}

		Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "logMergeRequested");
		Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER,
		TracingUtils.uiTracingSliceName("Transition::logMergeRequested"));
		try {
		doLogMergeRequested(mergeRequestedTransitionId, playingTransitionId);
		} finally {
		@@ -148,7 +151,8 @@ public class PerfettoTransitionTracer implements TransitionTracer {
		return;
		}

		Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "logMerged");
		Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER,
		TracingUtils.uiTracingSliceName("Transition::logMerged"));
		try {
		doLogMerged(mergedTransitionId, playingTransitionId);
		} finally {
		@@ -179,7 +183,8 @@ public class PerfettoTransitionTracer implements TransitionTracer {
		return;
		}

		Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "logAborted");
		Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER,
		TracingUtils.uiTracingSliceName("Transition::logAborted-shellSide"));
		try {
		doLogAborted(transitionId);
		} finally {

services/core/java/com/android/server/wm/PerfettoTransitionTracer.java

+9 −4

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import android.internal.perfetto.protos.ShellTransitionOuterClass.ShellTransitio
		import android.internal.perfetto.protos.TracePacketOuterClass.TracePacket;
		import android.os.SystemClock;
		import android.os.Trace;
		import android.tracing.TracingUtils;
		import android.tracing.perfetto.DataSourceParams;
		import android.tracing.perfetto.InitArguments;
		import android.tracing.perfetto.Producer;
		@@ -66,7 +67,8 @@ class PerfettoTransitionTracer implements TransitionTracer {
		return;
		}

		Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "logSentTransition");
		Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER,
		TracingUtils.uiTracingSliceName("Transition::logSent"));
		try {
		doLogSentTransition(transition, targets);
		} finally {
		@@ -110,7 +112,8 @@ class PerfettoTransitionTracer implements TransitionTracer {
		return;
		}

		Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "logFinishedTransition");
		Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER,
		TracingUtils.uiTracingSliceName("Transition::logFinished"));
		try {
		doLogFinishTransition(transition);
		} finally {
		@@ -142,7 +145,8 @@ class PerfettoTransitionTracer implements TransitionTracer {
		return;
		}

		Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "logAbortedTransition");
		Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER,
		TracingUtils.uiTracingSliceName("Transition::logAborted-coreSide"));
		try {
		doLogAbortedTransition(transition);
		} finally {
		@@ -168,7 +172,8 @@ class PerfettoTransitionTracer implements TransitionTracer {
		return;
		}

		Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "logRemovingStartingWindow");
		Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER,
		TracingUtils.uiTracingSliceName("Transition::logRemovingStartingWindow"));
		try {
		doLogRemovingStartingWindow(startingData);
		} finally {