Revert^2 "Remove expensive trace call in ProtoLog log call" (3bb5fd0f) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/protolog/PerfettoProtoLogImpl.java

+15 −27

Original line number	Diff line number	Diff line
		@@ -156,9 +156,6 @@ public class PerfettoProtoLogImpl implements IProtoLog {
		@Override
		public void log(LogLevel level, IProtoLogGroup group, long messageHash, int paramsMask,
		@Nullable Object[] args) {
		Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "log");

		try {
		if (isProtoEnabled()) {
		long tsNanos = SystemClock.elapsedRealtimeNanos();
		mBackgroundLoggingService.execute(() ->
		@@ -167,16 +164,10 @@ public class PerfettoProtoLogImpl implements IProtoLog {
		if (group.isLogToLogcat()) {
		logToLogcat(group.getTag(), level, messageHash, args);
		}
		} finally {
		Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);
		}
		}

		@Override
		public void log(LogLevel logLevel, IProtoLogGroup group, String messageString, Object... args) {
		Trace.traceBegin(Trace.TRACE_TAG_WINDOW_MANAGER, "log");

		try {
		if (isProtoEnabled()) {
		long tsNanos = SystemClock.elapsedRealtimeNanos();
		mBackgroundLoggingService.execute(
		@@ -186,9 +177,6 @@ public class PerfettoProtoLogImpl implements IProtoLog {
		if (group.isLogToLogcat()) {
		logToLogcat(group.getTag(), logLevel, messageString, args);
		}
		} finally {
		Trace.traceEnd(Trace.TRACE_TAG_WINDOW_MANAGER);
		}
		}

		private void dumpTransitionTraceConfig() {