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

Commit 460036e2 authored by Charles Yo's avatar Charles Yo Committed by Android Build Coastguard Worker
Browse files

Revert "Handle null args list" 

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:3220edea88aac96468bf2a5000d85820628f596d)
Merged-In: I0f55c0187b4dd74800a229299086d27cf5188665
Change-Id: I0f55c0187b4dd74800a229299086d27cf5188665
parent 88017614

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

+5 −9
Original line number Diff line number Diff line
@@ -170,7 +170,7 @@ public class PerfettoProtoLogImpl implements IProtoLog { 
    @VisibleForTesting

    @Override

    public void log(LogLevel level, IProtoLogGroup group, long messageHash, int paramsMask,

            @Nullable Object[] args) {

            Object[] args) {

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



        try {
@@ -297,8 +297,7 @@ public class PerfettoProtoLogImpl implements IProtoLog { 
        os.end(outMessagesToken);

    }



    private void logToLogcat(String tag, LogLevel level, long messageHash,

            @Nullable Object[] args) {

    private void logToLogcat(String tag, LogLevel level, long messageHash, Object[] args) {

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

        try {

            doLogToLogcat(tag, level, messageHash, args);
@@ -307,8 +306,7 @@ public class PerfettoProtoLogImpl implements IProtoLog { 
        }

    }



    private void doLogToLogcat(String tag, LogLevel level, long messageHash,

            @Nullable Object[] args) {

    private void doLogToLogcat(String tag, LogLevel level, long messageHash, Object[] args) {

        String message = null;

        String messageString = mViewerConfigReader.getViewerString(messageHash);

        if (messageString != null) {
@@ -324,11 +322,9 @@ public class PerfettoProtoLogImpl implements IProtoLog { 
        }

        if (message == null) {

            StringBuilder builder = new StringBuilder("UNKNOWN MESSAGE (" + messageHash + ")");

            if (args != null) {

            for (Object o : args) {

                builder.append(" ").append(o);

            }

            }

            message = builder.toString();

        }

        passToLogcat(tag, level, message);