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

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

Merge changes I5d84e3c9,Ia945cb55 into main 

* changes:
  Update tests
  Fix constructor check
parents 3d0cc12c 4d6e16f6

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

+4 −2
Original line number Diff line number Diff line
@@ -162,8 +162,10 @@ public class PerfettoProtoLogImpl extends IProtoLogClient.Stub implements IProto 
            @Nullable ViewerConfigInputStreamProvider viewerConfigInputStreamProvider,

            @Nullable ProtoLogViewerConfigReader viewerConfigReader,

            @NonNull Runnable cacheUpdater) {

        assert (viewerConfigFilePath == null || viewerConfigInputStreamProvider == null) :

                "Only one of viewerConfigFilePath and viewerConfigInputStreamProvider can be set";

        if (viewerConfigFilePath != null && viewerConfigInputStreamProvider != null) {

            throw new RuntimeException("Only one of viewerConfigFilePath and "

                    + "viewerConfigInputStreamProvider can be set");

        }



        Producer.init(InitArguments.DEFAULTS);

        DataSourceParams params =

tests/Internal/src/com/android/internal/protolog/PerfettoProtoLogImplTest.java

+4 −5
Original line number Diff line number Diff line
@@ -67,7 +67,6 @@ import java.io.File; 
import java.io.IOException;

import java.util.List;

import java.util.Random;

import java.util.TreeMap;

import java.util.concurrent.atomic.AtomicInteger;



/**
@@ -384,7 +383,7 @@ public class PerfettoProtoLogImplTest { 
                new Object[]{5});



        verify(implSpy).passToLogcat(eq(TestProtoLogGroup.TEST_GROUP.getTag()), eq(

                LogLevel.INFO), eq("UNKNOWN MESSAGE#1234 (5)"));

                LogLevel.INFO), eq("UNKNOWN MESSAGE args = (5)"));

        verify(mReader).getViewerString(eq(1234L));

    }
@@ -451,8 +450,8 @@ public class PerfettoProtoLogImplTest { 
            before = SystemClock.elapsedRealtimeNanos();

            mProtoLog.log(

                    LogLevel.INFO, TestProtoLogGroup.TEST_GROUP,

                    "My test message :: %s, %d, %o, %x, %f, %b",

                    "test", 1, 2, 3, 0.4, true);

                    "My test message :: %s, %d, %x, %f, %b",

                    "test", 1, 3, 0.4, true);

            after = SystemClock.elapsedRealtimeNanos();

        } finally {

            traceMonitor.stop(mWriter);
@@ -467,7 +466,7 @@ public class PerfettoProtoLogImplTest { 
        Truth.assertThat(protolog.messages.getFirst().getTimestamp().getElapsedNanos())

                .isAtMost(after);

        Truth.assertThat(protolog.messages.getFirst().getMessage())

                .isEqualTo("My test message :: test, 2, 4, 6, 0.400000, true");

                .isEqualTo("My test message :: test, 2, 6, 0.400000, true");

    }



    @Test