From dd89bf068d08bbf261c3b3dfd8f3c1b77edf098c Mon Sep 17 00:00:00 2001
From: Jing Ji <jji@google.com>
Date: Fri, 2 Apr 2021 16:01:10 -0700
Subject: Update ActivityManagerPerfTests test config.

As part of bringing up these tests in Cystalball,
use Collector helper library to wait for device to stabilize
before running the test.

Bug: 184190325
Test: atest ActivityManagerPerfTests
Change-Id: Ib81b93a71fe2a4447449a45be22f2e61957e405d
---
 tests/ActivityManagerPerfTests/tests/Android.bp      |  1 +
 tests/ActivityManagerPerfTests/tests/AndroidTest.xml | 17 +++++++++++++++++
 2 files changed, 18 insertions(+)

(limited to 'tests')

diff --git a/tests/ActivityManagerPerfTests/tests/Android.bp b/tests/ActivityManagerPerfTests/tests/Android.bp
index c8dbf811c69b..e5813aec9f43 100644
--- a/tests/ActivityManagerPerfTests/tests/Android.bp
+++ b/tests/ActivityManagerPerfTests/tests/Android.bp
@@ -28,6 +28,7 @@ android_test {
         "androidx.test.rules",
         "apct-perftests-utils",
         "ActivityManagerPerfTestsUtils",
+        "collector-device-lib-platform",
     ],
     platform_apis: true,
     min_sdk_version: "25",
diff --git a/tests/ActivityManagerPerfTests/tests/AndroidTest.xml b/tests/ActivityManagerPerfTests/tests/AndroidTest.xml
index 475bb82a9856..e753b704a3ae 100644
--- a/tests/ActivityManagerPerfTests/tests/AndroidTest.xml
+++ b/tests/ActivityManagerPerfTests/tests/AndroidTest.xml
@@ -28,5 +28,22 @@
     <test class="com.android.tradefed.testtype.AndroidJUnitTest">
         <option name="package" value="com.android.frameworks.perftests.amtests"/>
         <option name="runner" value="androidx.test.runner.AndroidJUnitRunner"/>
+
+        <!-- TODO: Add PerfettoListener to automatically capture perfetto traces for each test-->
+        <!-- Listener related args for collecting the traces and waiting for the device
+             to stabilize. -->
+        <option name="device-listeners"
+                value="android.device.collectors.ProcLoadListener" />
+        <!-- Guarantee that user defined RunListeners will be running before any of the default
+             listeners defined in this runner. -->
+        <option name="instrumentation-arg" key="newRunListenerMode" value="true" />
+
+        <!-- ProcLoadListener related arguments -->
+        <!-- Wait for device last minute threshold to reach 3 with 2 minute timeout before
+             starting the test run -->
+        <option name="instrumentation-arg" key="procload-collector:per_run" value="true" />
+        <option name="instrumentation-arg" key="proc-loadavg-threshold" value="3" />
+        <option name="instrumentation-arg" key="proc-loadavg-timeout" value="120000" />
+        <option name="instrumentation-arg" key="proc-loadavg-interval" value="10000" />
     </test>
 </configuration>
-- 
cgit v1.2.3-59-g8ed1b