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

Commit 0bb87e65 authored by Nataniel Borges's avatar Nataniel Borges Committed by Android (Google) Code Review
Browse files

Merge "Reduce Scenario object usage in flicker." into main

parents 72b49084 ca865e7f

apct-tests/perftests/tracing/src/android/tracing/perfetto/DataSourcePerfTest.kt

+1 −2
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import android.os.Trace 
import android.perftests.utils.BenchmarkState

import android.perftests.utils.PerfStatusReporter

import android.platform.test.annotations.Postsubmit

import android.tools.ScenarioBuilder

import android.tools.traces.busyWaitForDataSourceRegistration

import android.tools.traces.busyWaitTracingSessionDoesntExist

import android.tools.traces.busyWaitTracingSessionExists
@@ -483,7 +482,7 @@ class DataSourcePerfTest { 
    // Helper to create a dummy ResultWriter

    private fun createDummyWriter(scenarioDir: File): ResultWriter {

        return ResultWriter()

            .forScenario(ScenarioBuilder().forClass("DataSourcePerfTest").build())

            .withName("DataSourcePerfTest")

            .withOutputDir(scenarioDir)

            .setRunComplete()

    }

apct-tests/perftests/tracing/src/com/android/internal/protolog/ProtoLogPerfTest.kt

+1 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.internal.protolog 
import android.os.ServiceManager

import android.perftests.utils.PerfStatusReporter

import android.platform.test.annotations.Postsubmit

import android.tools.ScenarioBuilder

import android.tools.traces.busyWaitForDataSourceRegistration

import android.tools.traces.busyWaitTracingSessionDoesntExist

import android.tools.traces.busyWaitTracingSessionExists
@@ -192,7 +191,7 @@ class ProtoLogPerfTest(logType: LogType) { 
    // Helper to create a dummy ResultWriter

    private fun createDummyWriter(scenarioDir: File): ResultWriter {

        return ResultWriter()

            .forScenario(ScenarioBuilder().forClass("DataSourcePerfTest").build())

            .withName("DataSourcePerfTest")

            .withOutputDir(scenarioDir)

            .setRunComplete()

    }

apct-tests/perftests/tracing/src/com/android/server/wm/WmShellTransitionPerfTest.kt

+1 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.server.wm 
import android.os.IBinder

import android.perftests.utils.PerfStatusReporter

import android.platform.test.annotations.Postsubmit

import android.tools.ScenarioBuilder

import android.tools.traces.busyWaitTracingSessionDoesntExist

import android.tools.traces.busyWaitTracingSessionExists

import android.tools.traces.io.ResultWriter
@@ -90,7 +89,7 @@ class WmShellTransitionPerfTest(private val mTracingState: TracingState?) { 
    // Helper to create a dummy ResultWriter

    private fun createDummyWriter(scenarioDir: File): ResultWriter {

        return ResultWriter()

            .forScenario(ScenarioBuilder().forClass("DataSourcePerfTest").build())

            .withName("DataSourcePerfTest")

            .withOutputDir(scenarioDir)

            .setRunComplete()

    }

services/tests/wmtests/src/com/android/server/wm/WindowTracingPerfettoTest.java

+1 −3
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ import static java.io.File.createTempFile; 
import static java.nio.file.Files.createTempDirectory;



import android.platform.test.annotations.Presubmit;

import android.tools.ScenarioBuilder;

import android.tools.traces.io.ResultWriter;

import android.tools.traces.monitors.PerfettoTraceMonitor;

import android.util.Log;
@@ -206,8 +205,7 @@ public class WindowTracingPerfettoTest { 
        }



        ResultWriter writer = new ResultWriter()

                .forScenario(new ScenarioBuilder()

                        .forClass(createTempFile("temp", "").getName()).build())

                .withName(createTempFile("temp", "").getName())

                .withOutputDir(createTempDirectory("temp").toFile())

                .setRunComplete();

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

+2 −4
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ import static android.internal.perfetto.protos.TestEventOuterClass.TestEvent.PAY 
import static android.internal.perfetto.protos.TestEventOuterClass.TestEvent.TestPayload.SINGLE_INT;

import static android.internal.perfetto.protos.TracePacketOuterClass.TracePacket.FOR_TESTING;

import static android.tools.traces.Utils.busyWaitForDataSourceRegistration;

import static android.tools.traces.Utils.busyWaitTracingSessionExists;

import static android.tools.traces.Utils.busyWaitTracingSessionDoesntExist;

import static android.tools.traces.Utils.busyWaitTracingSessionExists;

import static android.tracing.perfetto.TestUtils.createTempWriter;



import static java.io.File.createTempFile;
@@ -29,7 +29,6 @@ import static java.nio.file.Files.createTempDirectory; 


import android.internal.perfetto.protos.DataSourceConfigOuterClass.DataSourceConfig;

import android.internal.perfetto.protos.TestConfigOuterClass.TestConfig;

import android.tools.ScenarioBuilder;

import android.tools.Tag;

import android.tools.io.TraceType;

import android.tools.traces.TraceConfig;
@@ -370,8 +369,7 @@ public class DataSourceTest { 


        for (int i = 0; i < instanceCount; i++) {

            final ResultWriter writer = new ResultWriter()

                    .forScenario(new ScenarioBuilder()

                            .forClass(createTempFile("temp", "").getName()).build())

                    .withName(createTempFile("temp", "").getName())

                    .withOutputDir(mTracingDirectory)

                    .setRunComplete();

            writers.add(writer);