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

Commit 915ed9d4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Make PerfettoProtoLogImpl.Message protected for children classes to be...

Merge "Make PerfettoProtoLogImpl.Message protected for children classes to be able to access it" into main
parents c0fdb26d c650d955
Loading
Loading
Loading
Loading
+8 −3
Original line number Diff line number Diff line
@@ -893,7 +893,7 @@ public class PerfettoProtoLogImpl extends IProtoLogClient.Stub implements IProto
        }
    }

    private static class Message {
    protected static class Message {
        @Nullable
        private final Long mMessageHash;
        private final int mMessageMask;
@@ -918,12 +918,17 @@ public class PerfettoProtoLogImpl extends IProtoLogClient.Stub implements IProto
        }

        @Nullable
        private String getMessage() {
        protected Long getMessageHash() {
            return mMessageHash;
        }

        @Nullable
        protected String getMessage() {
            return mMessageString;
        }

        @Nullable
        private String getMessage(@NonNull ProtoLogViewerConfigReader viewerConfigReader) {
        protected String getMessage(@NonNull ProtoLogViewerConfigReader viewerConfigReader) {
            if (mMessageString != null) {
                return mMessageString;
            }