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

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

Merge changes from topic "sf-perfetto-integration" into main 

* changes:
  Temporarily disable PerfettoListener
  Adapt flicker tests to perfetto-based SurfaceFlinger tracing
parents ce5a4940 50eb9f15

libs/WindowManager/Shell/tests/flicker/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ java_defaults { 
        "flickertestapplib",

        "flickerlib",

        "flickerlib-helpers",

        "flickerlib-trace_processor_shell",

        "platform-test-annotations",

        "wm-flicker-common-app-helpers",

        "wm-flicker-common-assertions",

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

+2 −0
Original line number Diff line number Diff line
@@ -73,7 +73,9 @@ 
        <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"

libs/WindowManager/Shell/tests/flicker/manifests/AndroidManifest.xml

+6 −2
Original line number Diff line number Diff line
@@ -45,9 +45,13 @@ 
    <uses-permission android:name="android.permission.MANAGE_ACTIVITY_TASKS" />

    <!-- Enable bubble notification-->

    <uses-permission android:name="android.permission.STATUS_BAR_SERVICE" />

    <!-- Allow the test to connect to perfetto trace processor -->

    <uses-permission android:name="android.permission.INTERNET"/>



    <!-- Allow the test to write directly to /sdcard/ -->

    <application android:requestLegacyExternalStorage="true" android:largeHeap="true">

    <!-- Allow the test to write directly to /sdcard/ and connect to trace processor -->

    <application android:requestLegacyExternalStorage="true"

                 android:networkSecurityConfig="@xml/network_security_config"

                 android:largeHeap="true">

        <uses-library android:name="android.test.runner"/>



        <service android:name=".NotificationListener"

libs/WindowManager/Shell/tests/flicker/res/xml/network_security_config.xml

0 → 100644
+22 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2023 The Android Open Source Project

  ~

  ~ Licensed under the Apache License, Version 2.0 (the "License");

  ~ you may not use this file except in compliance with the License.

  ~ You may obtain a copy of the License at

  ~

  ~      http://www.apache.org/licenses/LICENSE-2.0

  ~

  ~ Unless required by applicable law or agreed to in writing, software

  ~ distributed under the License is distributed on an "AS IS" BASIS,

  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->



<network-security-config>

    <domain-config cleartextTrafficPermitted="true">

        <domain includeSubdomains="true">localhost</domain>

    </domain-config>

</network-security-config>

tests/FlickerTests/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ java_defaults { 
        "flickertestapplib",

        "flickerlib",

        "flickerlib-helpers",

        "flickerlib-trace_processor_shell",

        "platform-test-annotations",

        "wm-flicker-common-app-helpers",

        "wm-shell-flicker-utils",