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

Commit 66698f67 authored by Pablo Gamito's avatar Pablo Gamito Committed by Android (Google) Code Review
Browse files

Merge "Prefix UI Tracing slices to have a common "UiTracing::" prefix" into main

parents 9ee7999e afdd63f4

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

+3 −1
Original line number Diff line number Diff line
@@ -235,6 +235,7 @@ import android.service.vr.IVrManager; 
import android.service.vr.IVrStateCallbacks;

import android.sysprop.SurfaceFlingerProperties;

import android.text.format.DateUtils;

import android.tracing.TracingUtils;

import android.util.ArrayMap;

import android.util.ArraySet;

import android.util.DisplayMetrics;
@@ -6924,7 +6925,8 @@ public class WindowManagerService extends IWindowManager.Stub 
     * @param logLevel  Determines the amount of data to be written to the Protobuf.

     */

    void dumpDebugLocked(ProtoOutputStream proto, @WindowTracingLogLevel int logLevel) {

        Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "dumpDebugLocked");

        Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER,

                TracingUtils.uiTracingSliceName("Window::dumpDebugLocked"));

        try {

            mPolicy.dumpDebug(proto, POLICY);

            mRoot.dumpDebug(proto, ROOT_WINDOW_CONTAINER, logLevel);

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

+3 −3
Original line number Diff line number Diff line
@@ -21,14 +21,14 @@ import android.internal.perfetto.protos.TracePacketOuterClass.TracePacket; 
import android.internal.perfetto.protos.WinscopeExtensionsImplOuterClass.WinscopeExtensionsImpl;

import android.os.ShellCommand;

import android.os.SystemClock;

import android.os.Trace;

import android.tracing.TracingUtils;

import android.util.Log;

import android.util.proto.ProtoOutputStream;

import android.view.Choreographer;



import com.android.internal.annotations.VisibleForTesting;



import android.os.Trace;



import java.io.PrintWriter;

import java.util.concurrent.atomic.AtomicInteger;
@@ -108,7 +108,7 @@ class WindowTracingPerfetto extends WindowTracing { 
    @Override

    protected void log(String where) {

        try {

            Trace.beginSection("window_tracing_log");

            Trace.beginSection(TracingUtils.uiTracingSliceName("Window::log"));

            boolean isStartLogEvent = where == WHERE_START_TRACING;

            boolean isOnFrameLogEvent = where == WHERE_ON_FRAME;