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

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

Merge "Uses new argument to force stop perfetto sessions" into main

parents cdb3ea7b 6f6f8bad

libs/WindowManager/Shell/tests/flicker/appcompat/AndroidTestTemplate.xml

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ 
                value="trace_config.textproto"

        />

        <option name="instrumentation-arg" key="per_run" value="true"/>

        <option name="instrumentation-arg" key="perfetto_persist_pid_track" value="true"/>

    </test>

    <!-- Needed for pulling the collected trace config on to the host -->

    <metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector">

libs/WindowManager/Shell/tests/flicker/bubble/AndroidTestTemplate.xml

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ 
                value="trace_config.textproto"

        />

        <option name="instrumentation-arg" key="per_run" value="true"/>

        <option name="instrumentation-arg" key="perfetto_persist_pid_track" value="true"/>

    </test>

    <!-- Needed for pulling the collected trace config on to the host -->

    <metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector">

libs/WindowManager/Shell/tests/flicker/pip/AndroidTestTemplate.xml

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ 
                value="trace_config.textproto"

        />

        <option name="instrumentation-arg" key="per_run" value="true"/>

        <option name="instrumentation-arg" key="perfetto_persist_pid_track" value="true"/>

    </test>

    <!-- Needed for pulling the collected trace config on to the host -->

    <metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector">

libs/WindowManager/Shell/tests/flicker/service/AndroidTestTemplate.xml

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ 
                value="trace_config.textproto"

        />

        <option name="instrumentation-arg" key="per_run" value="true"/>

        <option name="instrumentation-arg" key="perfetto_persist_pid_track" value="true"/>

    </test>

    <!-- Needed for pulling the collected trace config on to the host -->

    <metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector">

libs/WindowManager/Shell/tests/flicker/splitscreen/AndroidTestTemplate.xml

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ 
                value="trace_config.textproto"

        />

        <option name="instrumentation-arg" key="per_run" value="true"/>

        <option name="instrumentation-arg" key="perfetto_persist_pid_track" value="true"/>

    </test>

    <!-- Needed for pulling the collected trace config on to the host -->

    <metrics_collector class="com.android.tradefed.device.metric.FilePullerLogCollector">