commit f9969f706c445230e70e460ce0400286de93d53e
author Kean Mariotti <keanmariotti@google.com> Fri Jun 09 12:53:23 2023 +0000
committer Kean Mariotti <keanmariotti@google.com> Fri Sep 01 10:44:02 2023 +0000
tree c1af1e8f7ebf08993eaed2875bf64affc74cafc6
parent 6f43888d11593e0aa8745177683d20d0af39db56

Revert^2 Adapt flicker tests to perfetto-based SurfaceFlinger tracing

- Change permissions to allow connection to perfetto trace processor
- Add flickerlib-trace_processor_shell dependency to pull trace_processor_shell
  prebuilts into the apk
- Adapt test code to new perfetto trace monitor
- Remove obsolete TRACE_CRITICAL layer tracing flag in test code

Bug: b/284424740
Test: atest FlickerTestsAppClose && \
      atest FlickerTestsIme && \
      atest FlickerTestsQuickswitch && \
      atest FlickerTestsAppLaunch && \
      atest FlickerTestsOther && \
      atest FlickerTestsRotation && \
      atest TaskOrganizerTest
Change-Id: I9d3e645ad387ebe74ea4884d647dccab07415831

tests/TaskOrganizerTest/AndroidManifest.xml

diff --git a/tests/TaskOrganizerTest/AndroidManifest.xml b/tests/TaskOrganizerTest/AndroidManifest.xml
index 1f1bd3e..cbeb246 100644
--- a/tests/TaskOrganizerTest/AndroidManifest.xml
+++ b/tests/TaskOrganizerTest/AndroidManifest.xml
@@ -16,9 +16,11 @@
     <uses-permission android:name="android.permission.CHANGE_CONFIGURATION"/>
     <uses-permission android:name="android.permission.MANAGE_ACTIVITY_TASKS"/>
     <uses-permission android:name="android.permission.INTERACT_ACROSS_USERS_FULL"/>
+    <!-- Allow the test to connect to perfetto trace processor -->
+    <uses-permission android:name="android.permission.INTERNET"/>
     <!-- Enable / Disable tracing !-->
     <uses-permission android:name="android.permission.DUMP" />
-    <application>
+    <application android:networkSecurityConfig="@xml/network_security_config">
       <activity android:name="TaskOrganizerMultiWindowTest"
            android:label="TaskOrganizer MW Test"
            android:exported="true"