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

Commit 8bdb5827 authored by Charles Yo's avatar Charles Yo Committed by Android Build Coastguard Worker
Browse files

Revert "Remove expensive trace call in ProtoLog log call" 

Revert submission 28147757-no-processing-protolog

Reason for revert: b/351458758

Reverted changes: /q/submissionid:28147757-no-processing-protolog
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a72c380fc11dcfad37067bfc43f75bad1e0a46e7)
Merged-In: I51cde20aa3405914cb95570b05af31c0bb425daf
Change-Id: I51cde20aa3405914cb95570b05af31c0bb425daf
parent 7c27f667

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

+27 −15
Original line number Diff line number Diff line
@@ -156,6 +156,9 @@ 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(() ->
@@ -164,10 +167,16 @@ 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(
@@ -177,6 +186,9 @@ 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() {