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

Commit 40ac77cf authored by Kean Mariotti's avatar Kean Mariotti Committed by Android (Google) Code Review
Browse files

Merge "Re-enable PerfettoListener" into main

parents 0c970db0 f6b1842d

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

+0 −2
Original line number Diff line number Diff line
@@ -81,9 +81,7 @@ 
        <option name="shell-timeout" value="6600s"/>

        <option name="test-timeout" value="6000s"/>

        <option name="hidden-api-checks" value="false"/>

        <!-- TODO(b/288396763): re-enable when PerfettoListener is fixed

        <option name="device-listeners" value="android.device.collectors.PerfettoListener"/>

        -->

        <!-- PerfettoListener related arguments -->

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

        <option name="instrumentation-arg"

tests/FlickerTests/AndroidTestTemplate.xml

+0 −2
Original line number Diff line number Diff line
@@ -61,9 +61,7 @@ 
        <option name="shell-timeout" value="6600s"/>

        <option name="test-timeout" value="6600s"/>

        <option name="hidden-api-checks" value="false"/>

        <!-- TODO(b/288396763): re-enable when PerfettoListener is fixed

        <option name="device-listeners" value="android.device.collectors.PerfettoListener"/>

        -->

        <!-- PerfettoListener related arguments -->

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

        <option name="instrumentation-arg"