Merge tm-qpr-dev-plus-aosp-without-vendor@9467136temp_273316506_tm-qpr2

Bug: 264720040
Merged-In: Ie798a951f0ead88289269ebaae993054f3bc30f1
Change-Id: Ibbe41fed6d4593aadf3e0b565785eac834eb2946

2 files changed, 54 insertions, 1 deletions

diff --git a/tools/catbox-common/res/config/catbox-preparer.xml b/tools/catbox-common/res/config/catbox-preparer.xml
index db9aaf7..21109c5 100644
--- a/tools/catbox-common/res/config/catbox-preparer.xml
+++ b/tools/catbox-common/res/config/catbox-preparer.xml
@@ -68,7 +68,9 @@
   <target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher" />
 
   <!-- Target Preparers - Run Shell Commands -->
-  <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer" />
+  <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
+    <option name="run-command" value="am start -n com.google.android.car.setupwizard/.ExitActivity" />
+  </target_preparer>
 
   <!-- Target Preparers - Set Properties -->
   <target_preparer class="com.android.catbox.targetpreparer.SetDevicePropertyPreparer" />
diff --git a/tools/catbox-tradefed/res/config/catbox-performance-jank-media.xml b/tools/catbox-tradefed/res/config/catbox-performance-jank-media.xml
new file mode 100644
index 0000000..4212fa3
--- /dev/null
+++ b/tools/catbox-tradefed/res/config/catbox-performance-jank-media.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 Google Inc.
+
+     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.
+-->
+<configuration description="CATBox Jank Performance Test For Media.">
+  <!-- Plan -->
+  <option name="plan" value="catbox-performance-jank-media" />
+
+  <!-- Base File -->
+  <include name="catbox-performance-jank-base" />
+
+  <!-- Proc Load Options -->
+  <option name="compatibility:module-arg" value="AndroidAutomotiveMediaCenterScenarioTests:instrumentation-arg:procload-collector:per_run:=true" />
+  <option name="compatibility:module-arg" value="AndroidAutomotiveMediaCenterScenarioTests:instrumentation-arg:procload-collector:proc-loadavg-interval:=20000" />
+  <option name="compatibility:module-arg" value="AndroidAutomotiveMediaCenterScenarioTests:instrumentation-arg:procload-collector:proc-loadavg-threshold:=2.0" />
+  <option name="compatibility:module-arg" value="AndroidAutomotiveMediaCenterScenarioTests:instrumentation-arg:procload-collector:proc-loadavg-timeout:=900000" />
+
+  <!-- Jank Options -->
+  <option name="compatibility:module-arg" value="AndroidAutomotiveMediaCenterScenarioTests:instrumentation-arg:listener:=android.device.collectors.ProcLoadListener,android.device.collectors.JankListener" />
+  <option name="compatibility:module-arg" value="AndroidAutomotiveMediaCenterScenarioTests:instrumentation-arg:iterations:=20" />
+  <option name="compatibility:module-arg" value="AndroidAutomotiveMediaCenterScenarioTests:instrumentation-arg:favor-shell-commands:=true" />
+  <option name="compatibility:module-arg" value="AndroidAutomotiveMediaCenterScenarioTests:instrumentation-arg:rename-iterations:=true" />
+  <option name="compatibility:module-arg" value="AndroidAutomotiveMediaCenterScenarioTests:instrumentation-arg:iteration-separator:=$" />
+
+  <!-- Test Package -->
+  <option name="compatibility:test-arg" value="com.android.tradefed.testtype.AndroidJUnitTest:package:android.platform.test.scenario.mediacenter" />
+
+  <!-- Test -->
+  <option name="compatibility:include-filter" value="AndroidAutomotiveMediaCenterScenarioTests android.platform.test.scenario.mediacenter.ScrollMicrobenchmark#testScrollDownAndUp" />
+
+  <!-- Jank Package -->
+  <option name="compatibility:module-arg" value="AndroidAutomotiveMediaCenterScenarioTests:instrumentation-arg:jank-package-names:=com.android.car.media" />
+
+  <!-- Test Metrics Report Options -->
+  <option name="report-log-name" value="CatboxPerformanceTests" />
+  <option name="report-test-name-mapping" key="android.platform.test.scenario.mediacenter.ScrollMicrobenchmark#testScrollDownAndUp" value="media_scroll_jank" />
+  <option name="report-all-metrics" value="false" />
+  <!-- TODO: b/247588415 Add metrics to APFE -->
+  <option name="report-metric-key-mapping" key="gfxinfo_com.android.car.media_janky_frames_percent-mean" value="jank_frames_percent" />
+</configuration>
\ No newline at end of file