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

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

Merge "Remove TraceConfig and TraceConfigs" into main

parents eb68932a a94a25f6

libs/WindowManager/Shell/tests/e2e/splitscreen/flicker-legacy/src/com/android/wm/shell/flicker/splitscreen/MultipleShowImeRequestsInSplitScreen.kt

+1 −4
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import android.tools.ScenarioBuilder 
import android.tools.flicker.junit.FlickerParametersRunnerFactory

import android.tools.flicker.legacy.FlickerBuilder

import android.tools.flicker.legacy.LegacyFlickerTest

import android.tools.traces.SERVICE_TRACE_CONFIG

import android.tools.traces.component.ComponentNameMatcher

import androidx.test.filters.RequiresDevice

import com.android.wm.shell.flicker.splitscreen.benchmark.MultipleShowImeRequestsInSplitScreenBenchmark
@@ -66,9 +65,7 @@ class MultipleShowImeRequestsInSplitScreen(override val flicker: LegacyFlickerTe 
            .withStartRotation(Rotation.ROTATION_0)

            .withEndRotation(Rotation.ROTATION_0)

            .withNavBarMode(navBarMode), resultReaderProvider = { scenario ->

            android.tools.flicker.datastore.CachedResultReader(

                scenario, SERVICE_TRACE_CONFIG

            )

            android.tools.flicker.datastore.CachedResultReader(scenario)

        })



        @Parameterized.Parameters(name = "{0}")

tests/Tracing/src/android/tracing/perfetto/DataSourceTest.java

+6 −15
Original line number Diff line number Diff line
@@ -31,8 +31,6 @@ import android.internal.perfetto.protos.DataSourceConfigOuterClass.DataSourceCon 
import android.internal.perfetto.protos.TestConfigOuterClass.TestConfig;

import android.tools.Tag;

import android.tools.io.TraceType;

import android.tools.traces.TraceConfig;

import android.tools.traces.TraceConfigs;

import android.tools.traces.io.ResultReader;

import android.tools.traces.io.ResultWriter;

import android.tools.traces.monitors.PerfettoTraceMonitor;
@@ -68,13 +66,6 @@ import java.util.concurrent.atomic.AtomicReference; 
public class DataSourceTest {

    private final File mTracingDirectory = createTempDirectory("temp").toFile();



    private final TraceConfigs mTraceConfig = new TraceConfigs(

            new TraceConfig(false, true, false),

            new TraceConfig(false, true, false),

            new TraceConfig(false, true, false),

            new TraceConfig(false, true, false)

    );



    private static TestDataSource sTestDataSource;



    private static TestDataSource.DataSourceInstanceProvider sInstanceProvider;
@@ -129,7 +120,7 @@ public class DataSourceTest { 
            traceMonitor.stop(writer);

        }



        final ResultReader reader = new ResultReader(writer.write(), mTraceConfig);

        final ResultReader reader = new ResultReader(writer.write());

        final byte[] rawProtoFromFile = reader.readBytes(TraceType.PERFETTO, Tag.ALL);

        assert rawProtoFromFile != null;

        final perfetto.protos.TraceOuterClass.Trace trace = perfetto.protos.TraceOuterClass.Trace
@@ -420,7 +411,7 @@ public class DataSourceTest { 
        for (int i = 0; i < instanceCount; i++) {

            final int expectedTracedValue = i + 1;

            final ResultWriter writer = writers.get(i);

            final ResultReader reader = new ResultReader(writer.write(), mTraceConfig);

            final ResultReader reader = new ResultReader(writer.write());

            final byte[] rawProtoFromFile = reader.readBytes(TraceType.PERFETTO, Tag.ALL);

            assert rawProtoFromFile != null;

            final perfetto.protos.TraceOuterClass.Trace trace =
@@ -638,7 +629,7 @@ public class DataSourceTest { 
            traceMonitor.stop(writer);

        }



        final ResultReader reader = new ResultReader(writer.write(), mTraceConfig);

        final ResultReader reader = new ResultReader(writer.write());

        final byte[] rawProtoFromFile = reader.readBytes(TraceType.PERFETTO, Tag.ALL);

        assert rawProtoFromFile != null;

        final perfetto.protos.TraceOuterClass.Trace trace = perfetto.protos.TraceOuterClass.Trace
@@ -696,7 +687,7 @@ public class DataSourceTest { 
            traceMonitor.stop(writer);

        }



        final ResultReader reader = new ResultReader(writer.write(), mTraceConfig);

        final ResultReader reader = new ResultReader(writer.write());

        final byte[] rawProtoFromFile = reader.readBytes(TraceType.PERFETTO, Tag.ALL);

        assert rawProtoFromFile != null;

        final perfetto.protos.TraceOuterClass.Trace trace = perfetto.protos.TraceOuterClass.Trace
@@ -756,7 +747,7 @@ public class DataSourceTest { 
            traceMonitor.stop(writer);

        }



        final ResultReader reader = new ResultReader(writer.write(), mTraceConfig);

        final ResultReader reader = new ResultReader(writer.write());

        final byte[] rawProtoFromFile = reader.readBytes(TraceType.PERFETTO, Tag.ALL);

        assert rawProtoFromFile != null;

        final perfetto.protos.TraceOuterClass.Trace trace = perfetto.protos.TraceOuterClass.Trace
@@ -801,7 +792,7 @@ public class DataSourceTest { 
            traceMonitor.stop(writer);

        }



        final ResultReader reader = new ResultReader(writer.write(), mTraceConfig);

        final ResultReader reader = new ResultReader(writer.write());

        final byte[] rawProtoFromFile = reader.readBytes(TraceType.PERFETTO, Tag.ALL);

        assert rawProtoFromFile != null;

        final perfetto.protos.TraceOuterClass.Trace trace = perfetto.protos.TraceOuterClass.Trace

tests/Tracing/src/com/android/internal/protolog/ProcessedPerfettoProtoLogImplTest.java

+24 −33
Original line number Diff line number Diff line
@@ -38,8 +38,6 @@ import android.os.SystemClock; 
import android.platform.test.annotations.Presubmit;

import android.tools.Tag;

import android.tools.io.TraceType;

import android.tools.traces.TraceConfig;

import android.tools.traces.TraceConfigs;

import android.tools.traces.io.ResultReader;

import android.tools.traces.io.ResultWriter;

import android.tools.traces.monitors.PerfettoTraceMonitor;
@@ -91,13 +89,6 @@ public class ProcessedPerfettoProtoLogImplTest { 
    private final File mTracingDirectory = InstrumentationRegistry.getInstrumentation()

            .getTargetContext().getFilesDir();



    private final TraceConfigs mTraceConfig = new TraceConfigs(

            new TraceConfig(false, true, false),

            new TraceConfig(false, true, false),

            new TraceConfig(false, true, false),

            new TraceConfig(false, true, false)

    );



    private static ProtoLogConfigurationService sProtoLogConfigurationService;

    private static ProtoLogDataSource sTestDataSource;

    private static PerfettoProtoLogImpl sProtoLog;
@@ -268,7 +259,7 @@ public class ProcessedPerfettoProtoLogImplTest { 
            traceMonitor.stop(writer);

        }



        final ResultReader reader = new ResultReader(writer.write(), mTraceConfig);

        final ResultReader reader = new ResultReader(writer.write());

        final ProtoLogTrace protolog = reader.readProtoLogTrace();



        Truth.assertThat(protolog.messages).hasSize(1);
@@ -302,7 +293,7 @@ public class ProcessedPerfettoProtoLogImplTest { 
            traceMonitor.stop(writer);

        }



        final ResultReader reader = new ResultReader(writer.write(), mTraceConfig);

        final ResultReader reader = new ResultReader(writer.write());

        final ProtoLogTrace protolog = reader.readProtoLogTrace();



        Truth.assertThat(protolog.messages).hasSize(4);
@@ -339,7 +330,7 @@ public class ProcessedPerfettoProtoLogImplTest { 
            traceMonitor.stop(writer);

        }



        final ResultReader reader = new ResultReader(writer.write(), mTraceConfig);

        final ResultReader reader = new ResultReader(writer.write());

        final ProtoLogTrace protolog = reader.readProtoLogTrace();



        Truth.assertThat(protolog.messages).hasSize(3);
@@ -371,7 +362,7 @@ public class ProcessedPerfettoProtoLogImplTest { 
            traceMonitor.stop(writer);

        }



        final ResultReader reader = new ResultReader(writer.write(), mTraceConfig);

        final ResultReader reader = new ResultReader(writer.write());

        final ProtoLogTrace protolog = reader.readProtoLogTrace();



        Truth.assertThat(protolog.messages).hasSize(5);
@@ -473,7 +464,7 @@ public class ProcessedPerfettoProtoLogImplTest { 
            traceMonitor.stop(writer);

        }



        final ResultReader reader = new ResultReader(writer.write(), mTraceConfig);

        final ResultReader reader = new ResultReader(writer.write());

        final ProtoLogTrace protolog = reader.readProtoLogTrace();



        Truth.assertThat(protolog.messages).hasSize(1);
@@ -509,7 +500,7 @@ public class ProcessedPerfettoProtoLogImplTest { 
            traceMonitor.stop(writer);

        }



        final ResultReader reader = new ResultReader(writer.write(), mTraceConfig);

        final ResultReader reader = new ResultReader(writer.write());

        final ProtoLogTrace protolog = reader.readProtoLogTrace();



        Truth.assertThat(protolog.messages).hasSize(1);
@@ -536,7 +527,7 @@ public class ProcessedPerfettoProtoLogImplTest { 
            traceMonitor.stop(writer);

        }



        final ResultReader reader = new ResultReader(writer.write(), mTraceConfig);

        final ResultReader reader = new ResultReader(writer.write());

        final ProtoLogTrace protolog = reader.readProtoLogTrace();



        Truth.assertThat(protolog.messages).hasSize(1);
@@ -576,7 +567,7 @@ public class ProcessedPerfettoProtoLogImplTest { 
            traceMonitor.stop(writer);

        }



        final ResultReader reader = new ResultReader(writer.write(), mTraceConfig);

        final ResultReader reader = new ResultReader(writer.write());

        assertThrows(java.net.SocketException.class, reader::readProtoLogTrace);

    }
@@ -595,7 +586,7 @@ public class ProcessedPerfettoProtoLogImplTest { 
            traceMonitor.stop(writer);

        }



        final ResultReader reader = new ResultReader(writer.write(), mTraceConfig);

        final ResultReader reader = new ResultReader(writer.write());

        final ProtoLogTrace protolog = reader.readProtoLogTrace();



        Truth.assertThat(protolog.messages).isEmpty();
@@ -623,7 +614,7 @@ public class ProcessedPerfettoProtoLogImplTest { 
            traceMonitor.stop(writer);

        }



        final ResultReader reader = new ResultReader(writer.write(), mTraceConfig);

        final ResultReader reader = new ResultReader(writer.write());

        final ProtoLogTrace protolog = reader.readProtoLogTrace();



        Truth.assertThat(protolog.messages).hasSize(1);
@@ -790,7 +781,7 @@ public class ProcessedPerfettoProtoLogImplTest { 
            traceMonitor.stop(writer);

        }



        final ResultReader reader = new ResultReader(writer.write(), mTraceConfig);

        final ResultReader reader = new ResultReader(writer.write());

        final ProtoLogTrace protolog = reader.readProtoLogTrace();



        Truth.assertThat(protolog.messages).hasSize(1);
@@ -814,7 +805,7 @@ public class ProcessedPerfettoProtoLogImplTest { 
            traceMonitor.stop(writer);

        }



        final ResultReader reader = new ResultReader(writer.write(), mTraceConfig);

        final ResultReader reader = new ResultReader(writer.write());

        final ProtoLogTrace protolog = reader.readProtoLogTrace();



        Truth.assertThat(protolog.messages).hasSize(1);
@@ -845,10 +836,10 @@ public class ProcessedPerfettoProtoLogImplTest { 
            traceMonitor2.stop(writer2);

        }



        final ResultReader reader = new ResultReader(writer.write(), mTraceConfig);

        final ResultReader reader = new ResultReader(writer.write());

        final ProtoLogTrace protologFromMonitor1 = reader.readProtoLogTrace();



        final ResultReader reader2 = new ResultReader(writer2.write(), mTraceConfig);

        final ResultReader reader2 = new ResultReader(writer2.write());

        final ProtoLogTrace protologFromMonitor2 = reader2.readProtoLogTrace();



        Truth.assertThat(protologFromMonitor1.messages).hasSize(1);
@@ -879,7 +870,7 @@ public class ProcessedPerfettoProtoLogImplTest { 
            traceMonitor.stop(writer);

        }



        final ResultReader reader = new ResultReader(writer.write(), mTraceConfig);

        final ResultReader reader = new ResultReader(writer.write());

        final ProtoLogTrace protolog = reader.readProtoLogTrace();



        Truth.assertThat(protolog.messages).hasSize(2);
@@ -912,7 +903,7 @@ public class ProcessedPerfettoProtoLogImplTest { 
            traceMonitor.stop(writer);

        }



        final ResultReader reader = new ResultReader(writer.write(), mTraceConfig);

        final ResultReader reader = new ResultReader(writer.write());

        final ProtoLogTrace protolog = reader.readProtoLogTrace();



        Truth.assertThat(protolog.messages).hasSize(1);
@@ -943,7 +934,7 @@ public class ProcessedPerfettoProtoLogImplTest { 
            traceMonitor.stop(writer);

        }



        final ResultReader reader = new ResultReader(writer.write(), mTraceConfig);

        final ResultReader reader = new ResultReader(writer.write());

        final ProtoLogTrace protolog = reader.readProtoLogTrace();



        Truth.assertThat(protolog.messages).hasSize(1);
@@ -1013,7 +1004,7 @@ public class ProcessedPerfettoProtoLogImplTest { 
            traceMonitor.stop(writer);

        }



        final ResultReader reader = new ResultReader(writer.write(), mTraceConfig);

        final ResultReader reader = new ResultReader(writer.write());

        final ProtoLogTrace protolog = reader.readProtoLogTrace();



        Truth.assertThat(protolog.messages).hasSize(1);
@@ -1090,12 +1081,12 @@ public class ProcessedPerfettoProtoLogImplTest { 
        traceMonitor1.stop(writer1);

        busyWaitTracingSessionDoesntExist("test_session1");



        final ResultReader reader0 = new ResultReader(writer0.write(), mTraceConfig);

        final ResultReader reader0 = new ResultReader(writer0.write());

        final ProtoLogTrace protolog0 = reader0.readProtoLogTrace();



        Truth.assertThat(protolog0.messages).hasSize(numOldMessages + numNewMessages);



        final ResultReader reader1 = new ResultReader(writer1.write(), mTraceConfig);

        final ResultReader reader1 = new ResultReader(writer1.write());

        final ProtoLogTrace protolog1 = reader1.readProtoLogTrace();



        Truth.assertThat(protolog1.messages).hasSize(numNewMessages);
@@ -1185,7 +1176,7 @@ public class ProcessedPerfettoProtoLogImplTest { 
        }



        // Verify that all messages were written to the trace.

        final ResultReader reader = new ResultReader(writer.write(), mTraceConfig);

        final ResultReader reader = new ResultReader(writer.write());

        final ProtoLogTrace protolog = reader.readProtoLogTrace();



        Truth.assertThat(protolog.messages).hasSize(numMessages);
@@ -1242,7 +1233,7 @@ public class ProcessedPerfettoProtoLogImplTest { 
            traceMonitor.stop(writer);

        }



        final ResultReader resultReader = new ResultReader(writer.write(), mTraceConfig);

        final ResultReader resultReader = new ResultReader(writer.write());

        final ProtoLogTrace protologTrace = resultReader.readProtoLogTrace();



        Truth.assertThat(protologTrace.messages).hasSize(1);
@@ -1274,7 +1265,7 @@ public class ProcessedPerfettoProtoLogImplTest { 
            traceMonitor.stop(writer);

        }



        final ResultReader reader = new ResultReader(writer.write(), mTraceConfig);

        final ResultReader reader = new ResultReader(writer.write());

        final var traceBytes = reader.readBytes(TraceType.PERFETTO, Tag.ALL);

        final var trace = Trace.parseFrom(traceBytes);

        final var protoLogMessagePackets = trace.getPacketList().stream()
@@ -1307,7 +1298,7 @@ public class ProcessedPerfettoProtoLogImplTest { 
            traceMonitor.stop(writer);

        }



        final ResultReader reader = new ResultReader(writer.write(), mTraceConfig);

        final ResultReader reader = new ResultReader(writer.write());

        final var traceBytes = reader.readBytes(TraceType.PERFETTO, Tag.ALL);

        final var trace = Trace.parseFrom(traceBytes);

        final var protoLogMessagePackets = trace.getPacketList().stream()

tests/Tracing/src/com/android/internal/protolog/ProtoLogConfigurationServiceTest.java

+1 −10
Original line number Diff line number Diff line
@@ -30,8 +30,6 @@ import android.os.RemoteException; 
import android.platform.test.annotations.Presubmit;

import android.tools.Tag;

import android.tools.io.TraceType;

import android.tools.traces.TraceConfig;

import android.tools.traces.TraceConfigs;

import android.tools.traces.io.ResultReader;

import android.tools.traces.io.ResultWriter;

import android.tools.traces.monitors.PerfettoTraceMonitor;
@@ -113,13 +111,6 @@ public class ProtoLogConfigurationServiceTest { 
            .withOutputDir(mTracingDirectory)

            .setRunComplete();



    private final TraceConfigs mTraceConfig = new TraceConfigs(

            new TraceConfig(false, true, false),

            new TraceConfig(false, true, false),

            new TraceConfig(false, true, false),

            new TraceConfig(false, true, false)

    );



    @Captor

    ArgumentCaptor<IBinder.DeathRecipient> mDeathRecipientArgumentCaptor;
@@ -179,7 +170,7 @@ public class ProtoLogConfigurationServiceTest { 


        traceMonitor.start();

        traceMonitor.stop(mWriter);

        final ResultReader reader = new ResultReader(mWriter.write(), mTraceConfig);

        final ResultReader reader = new ResultReader(mWriter.write());

        final byte[] traceData = reader.readBytes(TraceType.PERFETTO, Tag.ALL);



        final Trace trace = Trace.parseFrom(traceData);

tests/Tracing/src/com/android/internal/protolog/UnprocessedPerfettoProtoLogImplTest.java

+1 −10
Original line number Diff line number Diff line
@@ -23,8 +23,6 @@ import static perfetto.protos.TracePacketOuterClass.TracePacket.SequenceFlags.SE 


import android.tools.Tag;

import android.tools.io.TraceType;

import android.tools.traces.TraceConfig;

import android.tools.traces.TraceConfigs;

import android.tools.traces.io.ResultReader;

import android.tools.traces.monitors.PerfettoTraceMonitor;

import android.tracing.perfetto.DataSourceParams;
@@ -54,13 +52,6 @@ public class UnprocessedPerfettoProtoLogImplTest { 
    private final File mTracingDirectory = InstrumentationRegistry.getInstrumentation()

            .getTargetContext().getFilesDir();



    private final TraceConfigs mTraceConfig = new TraceConfigs(

            new TraceConfig(false, true, false),

            new TraceConfig(false, true, false),

            new TraceConfig(false, true, false),

            new TraceConfig(false, true, false)

    );



    private static ProtoLogDataSource sTestDataSource;

    private static UnprocessedPerfettoProtoLogImpl sProtoLog;
@@ -112,7 +103,7 @@ public class UnprocessedPerfettoProtoLogImplTest { 
            traceMonitor.stop(writer);

        }



        final ResultReader reader = new ResultReader(writer.write(), mTraceConfig);

        final ResultReader reader = new ResultReader(writer.write());

        final var traceBytes = reader.readBytes(TraceType.PERFETTO, Tag.ALL);

        final var trace = Trace.parseFrom(traceBytes);