From 527b35bc311b8824b83495103adcf7383d9a9e00 Mon Sep 17 00:00:00 2001
From: Priya Tandon <tandonp@google.com>
Date: Thu, 9 Mar 2023 23:36:53 +0000
Subject: Update the scroll function name in performance xml Test: NA Bug:
 272314299

Change-Id: I30800314fd0cd0edcba8ef346c3989f453ca05dd
---
 tools/catbox-tradefed/res/config/catbox-performance-jank-appgrid.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/catbox-tradefed/res/config/catbox-performance-jank-appgrid.xml b/tools/catbox-tradefed/res/config/catbox-performance-jank-appgrid.xml
index 0c14d83..be24379 100644
--- a/tools/catbox-tradefed/res/config/catbox-performance-jank-appgrid.xml
+++ b/tools/catbox-tradefed/res/config/catbox-performance-jank-appgrid.xml
@@ -37,14 +37,14 @@
   <option name="compatibility:test-arg" value="com.android.tradefed.testtype.AndroidJUnitTest:package:android.platform.test.scenario.appgrid" />
 
   <!-- Test -->
-  <option name="compatibility:include-filter" value="AndroidAutomotiveAppGridScenarioTests android.platform.test.scenario.appgrid.ScrollMicrobenchmark#testScrollDownAndUp" />
+  <option name="compatibility:include-filter" value="AndroidAutomotiveAppGridScenarioTests android.platform.test.scenario.appgrid.ScrollMicrobenchmark#testScrollForwardAndBackward" />
 
   <!-- Jank Package -->
   <option name="compatibility:module-arg" value="AndroidAutomotiveAppGridScenarioTests:instrumentation-arg:jank-package-names:=com.android.car.carlauncher" />
 
   <!-- Test Metrics Report Options -->
   <option name="report-log-name" value="CatboxPerformanceTests" />
-  <option name="report-test-name-mapping" key="android.platform.test.scenario.appgrid.ScrollMicrobenchmark#testScrollDownAndUp" value="appgrid_scroll_jank" />
+  <option name="report-test-name-mapping" key="android.platform.test.scenario.appgrid.ScrollMicrobenchmark#testScrollForwardAndBackward" value="appgrid_scroll_jank" />
   <option name="report-all-metrics" value="false" />
   <option name="report-metric-key-mapping" key="gfxinfo_com.android.car.carlauncher_janky_frames_percent-mean" value="jank_frames_percent" />
 </configuration>
-- 
cgit v1.2.3


From 228e09ff9b2ad0d42107193786c24f924ebd3b3f Mon Sep 17 00:00:00 2001
From: Zhaoming Yin <zhaomingyin@google.com>
Date: Wed, 8 Mar 2023 17:37:26 -0800
Subject: Add Moped Runner

Test:  ./tools/catbox-tradefed run commandAndExit catbox-functional-btmoped
      result: https://paste.googleplex.com/6305483139842048
Bug: 242207115

Change-Id: Icbd1a9a07b1fb5184d0365a003f0c4a835fd18ff
---
 prebuilts/Android.mk                               |  23 ++++
 prebuilts/moped_bluev/Android.mk                   |  26 ++++
 prebuilts/moped_bluev/moped.tar.gz                 | Bin 0 -> 6934111 bytes
 runner/Android.bp                                  |  27 +++++
 .../src/com/android/catbox/runner/MopedRunner.java | 134 +++++++++++++++++++++
 tools/catbox-tradefed/Android.bp                   |   3 +-
 .../res/config/catbox-functional-btmoped.xml       |  20 +++
 7 files changed, 232 insertions(+), 1 deletion(-)
 create mode 100644 prebuilts/Android.mk
 create mode 100644 prebuilts/moped_bluev/Android.mk
 create mode 100644 prebuilts/moped_bluev/moped.tar.gz
 create mode 100644 runner/Android.bp
 create mode 100644 runner/src/com/android/catbox/runner/MopedRunner.java
 create mode 100644 tools/catbox-tradefed/res/config/catbox-functional-btmoped.xml

diff --git a/prebuilts/Android.mk b/prebuilts/Android.mk
new file mode 100644
index 0000000..3b01d73
--- /dev/null
+++ b/prebuilts/Android.mk
@@ -0,0 +1,23 @@
+# 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.
+
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+# tag this module as a catbox test artifact
+LOCAL_COMPATIBILITY_SUITE := CATBOX
+
+# Build the test APKs using their own makefiles
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/prebuilts/moped_bluev/Android.mk b/prebuilts/moped_bluev/Android.mk
new file mode 100644
index 0000000..e26f013
--- /dev/null
+++ b/prebuilts/moped_bluev/Android.mk
@@ -0,0 +1,26 @@
+#
+# 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.
+###############################################################################
+LOCAL_PATH := $(call my-dir)
+MOPED_NAME := moped.tar.gz
+MOPED_TAR_PATH := $(LOCAL_PATH)/$(MOPED_NAME)
+
+TESTCASES_DIR := $(HOST_OUT)/catbox/android-catbox/testcases
+
+# Moped Test Binary
+COMPATIBILITY.catbox.FILES += $(call copy-many-files,\
+    $(MOPED_TAR_PATH):$(TESTCASES_DIR)/$(MOPED_NAME))
+
+###############################################################################
diff --git a/prebuilts/moped_bluev/moped.tar.gz b/prebuilts/moped_bluev/moped.tar.gz
new file mode 100644
index 0000000..9e2c7ee
Binary files /dev/null and b/prebuilts/moped_bluev/moped.tar.gz differ
diff --git a/runner/Android.bp b/runner/Android.bp
new file mode 100644
index 0000000..026d429
--- /dev/null
+++ b/runner/Android.bp
@@ -0,0 +1,27 @@
+// 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.
+
+package {
+    default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
+java_library_host {
+    name: "catbox-test-runner-lib",
+
+    srcs: ["src/**/*.java"],
+
+    libs: [
+        "tradefed",
+    ],
+}
diff --git a/runner/src/com/android/catbox/runner/MopedRunner.java b/runner/src/com/android/catbox/runner/MopedRunner.java
new file mode 100644
index 0000000..f18b7d1
--- /dev/null
+++ b/runner/src/com/android/catbox/runner/MopedRunner.java
@@ -0,0 +1,134 @@
+
+// Copyright 2023 Google Inc. All Rights Reserved.
+package com.google.android.car.aaosbt;
+import com.android.ddmlib.Log.LogLevel;
+import com.android.tradefed.config.Option;
+import com.android.tradefed.config.OptionClass;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.invoker.TestInformation;
+import com.android.tradefed.log.LogUtil.CLog;
+import com.android.tradefed.targetprep.TargetSetupError;
+import java.io.File;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.io.IOException;
+import java.io.BufferedReader;
+import java.io.InputStreamReader;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.concurrent.TimeoutException;
+import java.util.concurrent.TimeUnit;
+import com.android.tradefed.result.ITestInvocationListener;
+import com.android.tradefed.testtype.IRemoteTest;
+import java.net.URISyntaxException;
+import com.android.tradefed.device.ITestDevice;
+
+@OptionClass(alias = "aaos-moped-test")
+public class MopedRunner implements IRemoteTest {
+    @Option(name = "test-artifact", description = "test artifact")
+    private File test_artifact = null;
+
+    @Option(name = "artifact", description = "test artifact")
+    private String artifact_str = null;
+
+    @Option(name = "unzip-build-timeout-min", description = "unzip build timeout in minutes")
+    private int unzip_build_timeout_min = 10;
+
+    @Option(name = "test-timeout-min", description = "test timeout in minutes")
+    private int test_timeout_min = 60;
+
+    private File mLocalDestFile;
+    private File mLocalSrcFile;
+    private String mArtifactLocation;
+
+    private void unTarTestArtifact(TestInformation testInfo) throws TargetSetupError, TimeoutException, URISyntaxException {
+        if (test_artifact != null && artifact_str == null) {
+            artifact_str = test_artifact.toPath().toString();
+        }
+        String jarPath = getClass()
+          .getProtectionDomain()
+          .getCodeSource()
+          .getLocation()
+          .toURI()
+          .getPath();
+        File jarFile = new File(jarPath);
+        mLocalSrcFile = new File(jarFile.getParent() + "/../testcases/" + artifact_str);
+        mLocalDestFile = new File(testInfo.dependenciesFolder().toString());
+        mArtifactLocation =
+                mLocalDestFile.getPath()
+                        + "/"
+                        + mLocalSrcFile.getName().replaceAll(".tar.*gz", "/");
+        Path localArtifactPath = Paths.get(mArtifactLocation);
+        if (!Files.exists(localArtifactPath)) {
+            // untar file
+            executeHostCommand(
+                    new String[] {
+                        "bash",
+                        "-c",
+                        "tar xf " + mLocalSrcFile.getPath() + " -C " + mLocalDestFile.getPath()
+                    },
+                    unzip_build_timeout_min);
+        }
+    }
+
+    private String getDevicesString(TestInformation testInfo) {
+      String deviceString = "";
+      for(ITestDevice device : testInfo.getDevices()) {
+        deviceString += " " + device.getSerialNumber();
+      }
+      return deviceString;
+    }
+
+    @Override
+    public void run(TestInformation testInfo, ITestInvocationListener listener)
+            throws DeviceNotAvailableException {
+        // Download Moped binanry / config and run test
+        try {
+            unTarTestArtifact(testInfo);
+            executeHostCommand(
+                    new String[] {"bash", "-c", "bash " + mArtifactLocation + "run.sh"+getDevicesString(testInfo)},
+                    test_timeout_min);
+        } catch (TargetSetupError e) {
+            CLog.logAndDisplay(LogLevel.VERBOSE, "There are problems running tests! %s", e);
+        } catch (TimeoutException e) {
+            CLog.logAndDisplay(LogLevel.VERBOSE, "Test execution timeout! %s", e);
+        } catch (URISyntaxException e) {
+            CLog.logAndDisplay(LogLevel.VERBOSE, "Test artifact not found! %s", e);
+        }
+    }
+
+    private ArrayList<String> executeHostCommand(String[] command, int timeout)
+            throws TargetSetupError, TimeoutException {
+        ArrayList<String> ret = new ArrayList<String>();
+        try {
+            CLog.logAndDisplay(
+                    LogLevel.VERBOSE, "Output of running %s is:", Arrays.toString(command));
+            Process p = Runtime.getRuntime().exec(command);
+            if (!p.waitFor(timeout, TimeUnit.MINUTES)) {
+                p.destroy();
+                throw new TimeoutException();
+            }
+            InputStream is = p.getInputStream();
+            InputStreamReader isr = new InputStreamReader(is);
+            BufferedReader br = new BufferedReader(isr);
+            String line;
+            while ((line = br.readLine()) != null) {
+                CLog.logAndDisplay(LogLevel.VERBOSE, line);
+                ret.add(line);
+            }
+            int exitCode = p.waitFor();
+            if (exitCode != 0) {
+                throw new TargetSetupError(
+                        "Execution of command " + Arrays.toString(command) + " failed!");
+            }
+        } catch (IOException e) {
+            CLog.logAndDisplay(LogLevel.VERBOSE, "There are problems with IO! %s", e);
+        } catch (InterruptedException e) {
+            CLog.logAndDisplay(LogLevel.VERBOSE, "User interruption!");
+        }
+        return ret;
+    }
+}
+
diff --git a/tools/catbox-tradefed/Android.bp b/tools/catbox-tradefed/Android.bp
index 493e19c..c94cc9f 100644
--- a/tools/catbox-tradefed/Android.bp
+++ b/tools/catbox-tradefed/Android.bp
@@ -39,7 +39,8 @@ tradefed_binary_host {
     static_libs: [
         "cts-tradefed-harness",
         "catbox-common",
-        "catbox-preparer-lib"
+        "catbox-preparer-lib",
+        "catbox-test-runner-lib"
     ],
     required: [
         "compatibility-host-util",
diff --git a/tools/catbox-tradefed/res/config/catbox-functional-btmoped.xml b/tools/catbox-tradefed/res/config/catbox-functional-btmoped.xml
new file mode 100644
index 0000000..290bf49
--- /dev/null
+++ b/tools/catbox-tradefed/res/config/catbox-functional-btmoped.xml
@@ -0,0 +1,20 @@
+<!--
+ Copyright (C) 2023 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="Complete Automotive Tests - Bluetooth Moped based Functional Tests.">
+   <test class="com.google.android.car.aaosbt.MopedRunner">
+     <option name="test-artifact" value="moped.tar.gz" />
+   </test>
+</configuration>
-- 
cgit v1.2.3


From 9dd95d80ada3f7b23080f69f8542c2ea0d8ba72f Mon Sep 17 00:00:00 2001
From: Zhaoming Yin <zhaomingyin@google.com>
Date: Wed, 5 Apr 2023 11:16:07 -0700
Subject: update moped.tar.gz

Enabled the 1 device stress test

Test:  ./tools/catbox-tradefed run commandAndExit catbox-functional-btmoped
result: https://paste.googleplex.com/4813567327993856
Bug: 242207115

Change-Id: Id2a96cdf091c6d914d57d94a970391fa387def5b
---
 prebuilts/moped_bluev/moped.tar.gz | Bin 6934111 -> 6905238 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/prebuilts/moped_bluev/moped.tar.gz b/prebuilts/moped_bluev/moped.tar.gz
index 9e2c7ee..3881ba9 100644
Binary files a/prebuilts/moped_bluev/moped.tar.gz and b/prebuilts/moped_bluev/moped.tar.gz differ
-- 
cgit v1.2.3


From d7718b3b132983f39994b0f532a7132d2c77fb7e Mon Sep 17 00:00:00 2001
From: Zhaoming Yin <zhaomingyin@google.com>
Date: Wed, 19 Apr 2023 14:56:58 -0700
Subject: enable bluev moped runner to choose test suites

Bug: 278758679
Test: see https://paste.googleplex.com/4622264099143680

Change-Id: I984dae2075863b34ff7214793431ae7a8be068fd
---
 prebuilts/moped_bluev/moped.tar.gz                 | Bin 6905238 -> 24727829 bytes
 .../src/com/android/catbox/runner/MopedRunner.java |  46 ++++++++++++++++++---
 .../res/config/catbox-functional-btmoped.xml       |  19 +++++++--
 3 files changed, 56 insertions(+), 9 deletions(-)

diff --git a/prebuilts/moped_bluev/moped.tar.gz b/prebuilts/moped_bluev/moped.tar.gz
index 3881ba9..38a9bbb 100644
Binary files a/prebuilts/moped_bluev/moped.tar.gz and b/prebuilts/moped_bluev/moped.tar.gz differ
diff --git a/runner/src/com/android/catbox/runner/MopedRunner.java b/runner/src/com/android/catbox/runner/MopedRunner.java
index f18b7d1..90d84bd 100644
--- a/runner/src/com/android/catbox/runner/MopedRunner.java
+++ b/runner/src/com/android/catbox/runner/MopedRunner.java
@@ -24,6 +24,9 @@ import com.android.tradefed.result.ITestInvocationListener;
 import com.android.tradefed.testtype.IRemoteTest;
 import java.net.URISyntaxException;
 import com.android.tradefed.device.ITestDevice;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.Collections;
 
 @OptionClass(alias = "aaos-moped-test")
 public class MopedRunner implements IRemoteTest {
@@ -39,10 +42,15 @@ public class MopedRunner implements IRemoteTest {
     @Option(name = "test-timeout-min", description = "test timeout in minutes")
     private int test_timeout_min = 60;
 
+    @Option(name = "testcase", description = "which moped test binary to run")
+    private String test_case = null;
+
     private File mLocalDestFile;
     private File mLocalSrcFile;
     private String mArtifactLocation;
 
+    private static final Map<String, String> autoDic = initDeviceMap();
+
     private void unTarTestArtifact(TestInformation testInfo) throws TargetSetupError, TimeoutException, URISyntaxException {
         if (test_artifact != null && artifact_str == null) {
             artifact_str = test_artifact.toPath().toString();
@@ -73,12 +81,35 @@ public class MopedRunner implements IRemoteTest {
         }
     }
 
-    private String getDevicesString(TestInformation testInfo) {
-      String deviceString = "";
+    private static Map<String, String> initDeviceMap() {
+      Map<String, String> map = new HashMap<>();
+      map.put("seahawk", "AUTO");
+      map.put("seahawk_hwasan", "AUTO");
+      map.put("cf_x86_auto", "AUTO");
+      return Collections.unmodifiableMap(map);
+    }
+
+    private String checkDevice(ITestDevice device) throws DeviceNotAvailableException {
+      String buildFlavor = device.getBuildFlavor().split("-")[0];
+      return autoDic.get(buildFlavor);
+    }
+
+    private String getDevicesString(TestInformation testInfo) throws DeviceNotAvailableException {
+      StringBuilder deviceString = new StringBuilder();
+      int deviceNum = 0;
+      int companionDeviceNum = 0;
       for(ITestDevice device : testInfo.getDevices()) {
-        deviceString += " " + device.getSerialNumber();
+        String deviceType = checkDevice(device);
+        if (deviceType.equals("AUTO")) {
+          deviceString.append(String.format(" --hu %s", device.getSerialNumber()));
+        } else {
+          companionDeviceNum++;
+          deviceString.append(String.format(" --phone%s %s", String.valueOf(companionDeviceNum), device.getSerialNumber()));
+        }
+        deviceNum++;
       }
-      return deviceString;
+      deviceString.append(String.format(" --devicenum %s", String.valueOf(deviceNum)));
+      return deviceString.toString();
     }
 
     @Override
@@ -88,8 +119,11 @@ public class MopedRunner implements IRemoteTest {
         try {
             unTarTestArtifact(testInfo);
             executeHostCommand(
-                    new String[] {"bash", "-c", "bash " + mArtifactLocation + "run.sh"+getDevicesString(testInfo)},
-                    test_timeout_min);
+                    new String[] {"bash", "-c", "bash " +
+                                          String.format("%s/run.sh %s --testcase %s", mArtifactLocation,
+                                          getDevicesString(testInfo),
+                                          test_case)},
+                                          test_timeout_min);
         } catch (TargetSetupError e) {
             CLog.logAndDisplay(LogLevel.VERBOSE, "There are problems running tests! %s", e);
         } catch (TimeoutException e) {
diff --git a/tools/catbox-tradefed/res/config/catbox-functional-btmoped.xml b/tools/catbox-tradefed/res/config/catbox-functional-btmoped.xml
index 290bf49..f5113b3 100644
--- a/tools/catbox-tradefed/res/config/catbox-functional-btmoped.xml
+++ b/tools/catbox-tradefed/res/config/catbox-functional-btmoped.xml
@@ -14,7 +14,20 @@
      limitations under the License.
 -->
 <configuration description="Complete Automotive Tests - Bluetooth Moped based Functional Tests.">
-   <test class="com.google.android.car.aaosbt.MopedRunner">
-     <option name="test-artifact" value="moped.tar.gz" />
-   </test>
+  <!-- Common Base -->
+  <include name="catbox-common"/>
+
+  <!-- Device Preparers -->
+  <include name="catbox-preparer"/>
+
+  <!-- Plan -->
+  <option name="plan" value="catbox-functional-btmoped"/>
+
+  <!-- Artificially disabling tests in CompatibilityTestSuite -->
+  <!-- See com.android.tradefed.testtype.suite.CompatibilityTestSuite:loadTests() -->
+  <option name="compatibility:reverse-exclude-filters" value="true" />
+
+  <test class="com.google.android.car.aaosbt.MopedRunner">
+    <option name="test-artifact" value="moped.tar.gz" />
+  </test>
 </configuration>
-- 
cgit v1.2.3


From e7bc8e8300968ed04a849f86fb793f4fe01a734f Mon Sep 17 00:00:00 2001
From: Ivan Kozlov <ivankozlov@google.com>
Date: Wed, 17 May 2023 16:33:09 -0700
Subject: Add Chrome Passenger Load util with md settings test

Test: make catbox; run perf test with md load;

Change-Id: Ifa5efa64c7c21ceacdfee8ec1684a77e1830d61e
---
 .../ChromeMdPassengerLoadPreparer.java             | 177 +++++++++++++++++++++
 .../res/config/catbox-performance-base.xml         |   3 +
 2 files changed, 180 insertions(+)
 create mode 100644 target_preparers/src/com/android/catbox/targetpreparer/ChromeMdPassengerLoadPreparer.java

diff --git a/target_preparers/src/com/android/catbox/targetpreparer/ChromeMdPassengerLoadPreparer.java b/target_preparers/src/com/android/catbox/targetpreparer/ChromeMdPassengerLoadPreparer.java
new file mode 100644
index 0000000..9fc4e88
--- /dev/null
+++ b/target_preparers/src/com/android/catbox/targetpreparer/ChromeMdPassengerLoadPreparer.java
@@ -0,0 +1,177 @@
+/*
+ * 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.
+ */
+
+package com.android.catbox.targetpreparer;
+
+import com.android.tradefed.build.IBuildInfo;
+import com.android.tradefed.config.Option;
+import com.android.tradefed.config.OptionClass;
+import com.android.tradefed.device.CollectingOutputReceiver;
+import com.android.tradefed.device.DeviceNotAvailableException;
+import com.android.tradefed.device.ITestDevice;
+import com.android.tradefed.invoker.TestInformation;
+import com.android.tradefed.log.LogUtil;
+import com.android.tradefed.result.error.DeviceErrorIdentifier;
+import com.android.tradefed.targetprep.BaseTargetPreparer;
+import com.android.tradefed.targetprep.BuildError;
+import com.android.tradefed.targetprep.TargetSetupError;
+import com.android.tradefed.targetprep.TestAppInstallSetup;
+import com.android.tradefed.util.CommandResult;
+import com.android.tradefed.util.CommandStatus;
+
+import java.io.ByteArrayOutputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+@OptionClass(alias = "chrome-md-passenger-load")
+public class ChromeMdPassengerLoadPreparer extends BaseTargetPreparer {
+    private static final String INSTR_SUCCESS = "OK (1 test)";
+
+    @Option(name = "skip-display-id", description = "Display id to skip passenger load for")
+    private List<Integer> mSkipDisplayIds = new ArrayList<>();
+
+    @Option(name = "url", description = "Url to open in Chrome browser", mandatory = true)
+    private String mUrl;
+
+    @Option(name = "package", description = "Chrome package")
+    private String mPackage = "com.android.chrome";
+
+    @Option(name = "activity", description = "Chrome activity")
+    private String mActivity = "com.google.android.apps.chrome.Main";
+
+    @Option(
+            name = "test-app-file-name",
+            description =
+                    "the name of an apk file to be installed in the user profiles.")
+    private List<String> mTestFiles = new ArrayList<>();
+
+    Map<Integer, Integer> mDisplayToCreatedUsers = new HashMap<>();
+    private final ArrayList<TestAppInstallSetup> mInstallPreparers =
+            new ArrayList<TestAppInstallSetup>();
+
+    @Override
+    public void setUp(TestInformation testInfo) throws TargetSetupError, BuildError,
+            DeviceNotAvailableException {
+        ITestDevice device = testInfo.getDevice();
+        Set<Integer> displayIds = device.listDisplayIdsForStartingVisibleBackgroundUsers();
+        for (Integer displayId : displayIds) {
+            if (mSkipDisplayIds.contains(displayId)) {
+                LogUtil.CLog.d("Skipping load on display %d", displayId);
+                continue;
+            }
+            int userId = createUser(device, displayId);
+            mDisplayToCreatedUsers.put(displayId, userId);
+        }
+
+        if (mDisplayToCreatedUsers.size() == 0) {
+            LogUtil.CLog.w("Won't create any passenger load. No display ids matched.");
+            throw new TargetSetupError(
+                    String.format("Available displays on the device %s. Skipped displays %s",
+                            displayIds, mSkipDisplayIds),
+                    device.getDeviceDescriptor());
+        }
+
+        installApks(testInfo);
+
+        for (Integer displayId : mDisplayToCreatedUsers.keySet()) {
+            int userId = mDisplayToCreatedUsers.get(displayId);
+            dismissInitialDialog(device, userId);
+            simulatePassengerLoad(device, userId);
+        }
+    }
+
+    @Override
+    public void tearDown(TestInformation testInfo, Throwable e)
+            throws DeviceNotAvailableException {
+        ITestDevice device = testInfo.getDevice();
+        for (TestAppInstallSetup installPreparer : mInstallPreparers) {
+            installPreparer.tearDown(testInfo, e);
+        }
+        for (int userId : mDisplayToCreatedUsers.values()) {
+            device.removeUser(userId);
+        }
+    }
+
+    private int createUser(ITestDevice device, int displayId)
+            throws TargetSetupError,
+            DeviceNotAvailableException {
+        int userId = device.createUser(String.format("user-display-%d", displayId));
+        LogUtil.CLog.d(
+                String.format("Created user with id %d for display %d", userId, displayId));
+        if (!device.startVisibleBackgroundUser(userId, displayId, true)) {
+            throw new TargetSetupError(
+                    String.format("Device failed to switch to user %d", userId),
+                    device.getDeviceDescriptor());
+        }
+        LogUtil.CLog.d(
+                String.format("Started background user %d for display %d", userId, displayId));
+        return userId;
+    }
+
+    private void installApks(TestInformation testInfo)
+            throws TargetSetupError, BuildError, DeviceNotAvailableException {
+        for (int userId : mDisplayToCreatedUsers.values()) {
+            TestAppInstallSetup installPreparer = new TestAppInstallSetup();
+            LogUtil.CLog.d(
+                    String.format("Installing the following test APKs in user %d: \n%s", userId,
+                            mTestFiles));
+            installPreparer.setUserId(userId);
+            installPreparer.setShouldGrantPermission(true);
+            for (String file : mTestFiles) {
+                installPreparer.addTestFileName(file);
+            }
+            installPreparer.addInstallArg("-r");
+            installPreparer.addInstallArg("-d");
+            installPreparer.setUp(testInfo);
+            mInstallPreparers.add(installPreparer);
+        }
+    }
+
+    private void simulatePassengerLoad(ITestDevice device, int userId)
+            throws TargetSetupError, DeviceNotAvailableException {
+        LogUtil.CLog.d(String.format("Launching Chrome for User %d with url %s", userId, mUrl));
+        String launchChromeActivityWithUrlCommand = String.format(
+                "am start -n %s/%s --user %d -a android.intent.action.VIEW -d %s", mPackage,
+                mActivity, userId, mUrl);
+        CommandResult result = device.executeShellV2Command(launchChromeActivityWithUrlCommand);
+        if (!CommandStatus.SUCCESS.equals(result.getStatus())) {
+            throw new TargetSetupError(
+                    String.format("Chrome activity failed to launch for user %d", userId),
+                    device.getDeviceDescriptor());
+        }
+    }
+
+    private void dismissInitialDialog(ITestDevice device, int userId)
+            throws DeviceNotAvailableException, TargetSetupError {
+        OutputStream output = new ByteArrayOutputStream();
+        String dismissCommand = String.format(
+                "am instrument -w --user %d -e class android.platform.tests"
+                        + ".ChromeDismissDialogsTest android.platform.tests/androidx.test.runner"
+                        + ".AndroidJUnitRunner",
+                userId);
+        device.executeShellV2Command(dismissCommand, output);
+        if (!output.toString().contains(INSTR_SUCCESS)) {
+            throw new TargetSetupError(
+                    String.format("Failed dismissal.\nCommand output: %s", output),
+                    device.getDeviceDescriptor(),
+                    DeviceErrorIdentifier.DEVICE_UNEXPECTED_RESPONSE);
+        }
+    }
+}
diff --git a/tools/catbox-common/res/config/catbox-performance-base.xml b/tools/catbox-common/res/config/catbox-performance-base.xml
index 6109552..9776291 100644
--- a/tools/catbox-common/res/config/catbox-performance-base.xml
+++ b/tools/catbox-common/res/config/catbox-performance-base.xml
@@ -38,5 +38,8 @@
     <option name="dest-dir" value="report-log-files/"/>
     <option name="temp-dir" value="temp-report-logs/"/>
   </target_preparer>
+  <target_preparer class="com.android.catbox.targetpreparer.ChromeMdPassengerLoadPreparer">
+    <option name="disable" value="true"/>
+  </target_preparer>
 
 </configuration>
-- 
cgit v1.2.3


From bb34499c59e2e67fa9e9eb6d036d818b61956488 Mon Sep 17 00:00:00 2001
From: Ravi Gutala <ravigutala@google.com>
Date: Thu, 22 Jun 2023 11:51:12 -0700
Subject: Add default value for ChromeMdPassengerLoadPreparer

Add default YT URL for the ChromeMdPassengerLoadPreparer class to prevent local CATBox test executions from breaking

Test: make catbox
These changes have been manually tested by executing the test on a locally connected reference device

Bug: 272541445
Change-Id: Idc8ec2fce19d6e1db1f6fb006c1a8825f21fdaa2
---
 tools/catbox-common/res/config/catbox-performance-base.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/catbox-common/res/config/catbox-performance-base.xml b/tools/catbox-common/res/config/catbox-performance-base.xml
index 9776291..0907b2b 100644
--- a/tools/catbox-common/res/config/catbox-performance-base.xml
+++ b/tools/catbox-common/res/config/catbox-performance-base.xml
@@ -40,6 +40,7 @@
   </target_preparer>
   <target_preparer class="com.android.catbox.targetpreparer.ChromeMdPassengerLoadPreparer">
     <option name="disable" value="true"/>
+    <option name="url" value="https://youtu.be/dQw4w9WgXcQ"/>
   </target_preparer>
 
 </configuration>
-- 
cgit v1.2.3


From 95e21aff49796ab7206a9a9a31e1a836cc58c91d Mon Sep 17 00:00:00 2001
From: Priya Tandon <tandonp@google.com>
Date: Mon, 6 Nov 2023 15:48:08 -0800
Subject: Increase the bluetooth test time Test: Locally Bug:b/294780789

Change-Id: I679896406c31fb4a03804a9be2b68b90a82c4328
---
 tools/catbox-tradefed/res/config/catbox-functional-bluetooth-tests.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/catbox-tradefed/res/config/catbox-functional-bluetooth-tests.xml b/tools/catbox-tradefed/res/config/catbox-functional-bluetooth-tests.xml
index 7630707..7e4ee44 100644
--- a/tools/catbox-tradefed/res/config/catbox-functional-bluetooth-tests.xml
+++ b/tools/catbox-tradefed/res/config/catbox-functional-bluetooth-tests.xml
@@ -61,7 +61,7 @@
   <test class="com.android.tradefed.testtype.mobly.MoblyBinaryHostTest">
     <!-- The mobly-par-file-name should match the module name -->
     <!-- Timeout limit in milliseconds for all test cases of the python binary -->
-    <option name="mobly-test-timeout" value="180000" />
+    <option name="mobly-test-timeout" value="300000" />
     <!-- Testbed config file -->
     <option name="mobly-config-file-name" value="bt_discovery_config.yaml" />
   </test>
-- 
cgit v1.2.3


From 9733d417a393521d659ae1b67d685c8e5cff3ba2 Mon Sep 17 00:00:00 2001
From: ambuluri <ambuluri@google.com>
Date: Wed, 8 Nov 2023 19:16:31 +0000
Subject: New Test for Admin user grant permissions on Admin user Grant
 Ppermissions.xml

Test: Locally
Bug: TBD

Change-Id: Ia2a5f710102acb521c68214d5ee972cdfb4e3e5d
---
 ...box-functional-admin-user-grant-permissions.xml | 34 ++++++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 tools/catbox-tradefed/res/config/catbox-functional-admin-user-grant-permissions.xml

diff --git a/tools/catbox-tradefed/res/config/catbox-functional-admin-user-grant-permissions.xml b/tools/catbox-tradefed/res/config/catbox-functional-admin-user-grant-permissions.xml
new file mode 100644
index 0000000..ea1afcd
--- /dev/null
+++ b/tools/catbox-tradefed/res/config/catbox-functional-admin-user-grant-permissions.xml
@@ -0,0 +1,34 @@
+<!--
+ Copyright (C) 2023 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="Complete Automotive Tests - AdminUserGrantPermissions Functional Tests.">
+  <!-- Common Base -->
+  <include name="catbox-common"/>
+
+  <!-- Device Preparers -->
+  <include name="catbox-preparer"/>
+
+  <!-- Plan -->
+  <option name="plan" value="  functional_tests.catbox_functional_admin_user_grant_permissions
+"/>
+
+  <!-- Test Args -->
+  <option name="compatibility:test-arg" value="com.android.tradefed.testtype.AndroidJUnitTest:runner:androidx.test.runner.AndroidJUnitRunner" />
+  <option name="compatibility:test-arg" value="com.android.tradefed.testtype.AndroidJUnitTest:package:android.platform.tests" />
+  <option name="compatibility:test-arg" value="com.android.tradefed.testtype.AndroidJUnitTest:no-rerun:true" />
+
+  <!-- Tests -->
+  <option name="compatibility:include-filter" value="AndroidAutomotiveAdminUserGrantPermissionsTests android.platform.tests.GrantPermissionsToNonAdminUserTest" />
+</configuration>
\ No newline at end of file
-- 
cgit v1.2.3


From de312f2226271d508eb319ec37a6fa314cdb5c28 Mon Sep 17 00:00:00 2001
From: Priya Tandon <tandonp@google.com>
Date: Mon, 9 Oct 2023 14:32:48 -0700
Subject: Update Bluetooth Catbox Config and device configs Test: Locally

./out/host/linux-x86/catbox/android-catbox/tools/catbox-tradefed run commandAndExit catbox-functional-bluetooth-tests --{phone}serial 27101JEGR02989  --{auto}serial b10e7810 --mobly-host:mobly-par-file-name BTSMSDeviceNotPairedTest

https://paste.googleplex.com/4959037631234048

./out/host/linux-x86/catbox/android-catbox/tools/catbox-tradefed run commandAndExit catbox-functional-bluetooth-tests --{phone}serial 27101JEGR02989 --{phone_notpaired}serial 1B131FQGR00101 --{auto}serial b10e7810 --mobly-host:mobly-par-file-name BTSMSUtilityTest --mobly-config-file-name bt_sms_config.yaml --template:map device-config=device-config/three-devices

Bug:302013776

Change-Id: I434e33cb0839768cfa8e460ad171ad7b7481297a
---
 .../config/catbox-functional-bluetooth-tests.xml   | 19 ++---------
 .../res/config/device-config/three-devices.xml     | 37 ++++++++++++++++++++++
 .../res/config/device-config/two-devices.xml       | 29 +++++++++++++++++
 3 files changed, 69 insertions(+), 16 deletions(-)
 create mode 100644 tools/catbox-tradefed/res/config/device-config/three-devices.xml
 create mode 100644 tools/catbox-tradefed/res/config/device-config/two-devices.xml

diff --git a/tools/catbox-tradefed/res/config/catbox-functional-bluetooth-tests.xml b/tools/catbox-tradefed/res/config/catbox-functional-bluetooth-tests.xml
index 7e4ee44..b1dcd97 100644
--- a/tools/catbox-tradefed/res/config/catbox-functional-bluetooth-tests.xml
+++ b/tools/catbox-tradefed/res/config/catbox-functional-bluetooth-tests.xml
@@ -35,21 +35,8 @@
   <!-- Default ABI -->
   <option name="compatibility:primary-abi-only" value="true" />
 
-  <device name="auto" >
-    <!-- Build Provider -->
-    <build_provider class="com.android.compatibility.common.tradefed.build.CompatibilityBuildProvider" />
-    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller" >
-      <option name="test-file-name" value="AutomotiveSnippet.apk" />
-    </target_preparer>
-  </device>
-
-  <device name="phone">
-    <!-- Build Provider -->
-    <build_provider class="com.android.compatibility.common.tradefed.build.CompatibilityBuildProvider" />
-    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller" >
-      <option name="test-file-name" value="PhoneSnippet.apk" />
-    </target_preparer>
-  </device>
+  <!-- Template for Device Configuration -->
+  <template-include name="device-config" default="device-config/two-devices" />
 
   <!--
       CATBox Runs all modules if it is not specified.
@@ -59,7 +46,7 @@
   <option name="compatibility:reverse-exclude-filters" value="true" />
 
   <test class="com.android.tradefed.testtype.mobly.MoblyBinaryHostTest">
-    <!-- The mobly-par-file-name should match the module name -->
+    <!-- The mobly-par-file-name should match the module name , it is passed on runtime-->
     <!-- Timeout limit in milliseconds for all test cases of the python binary -->
     <option name="mobly-test-timeout" value="300000" />
     <!-- Testbed config file -->
diff --git a/tools/catbox-tradefed/res/config/device-config/three-devices.xml b/tools/catbox-tradefed/res/config/device-config/three-devices.xml
new file mode 100644
index 0000000..ebf0151
--- /dev/null
+++ b/tools/catbox-tradefed/res/config/device-config/three-devices.xml
@@ -0,0 +1,37 @@
+<?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.
+-->
+<configuration description="Bluetooth Device Configuration For Threee Devices">
+  <device name="auto" >
+    <!-- Build Provider -->
+    <build_provider class="com.android.compatibility.common.tradefed.build.CompatibilityBuildProvider" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller" >
+      <option name="test-file-name" value="AutomotiveSnippet.apk" />
+    </target_preparer>
+  </device>
+
+  <device name="phone">
+    <!-- Build Provider -->
+    <build_provider class="com.android.compatibility.common.tradefed.build.CompatibilityBuildProvider" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller" >
+      <option name="test-file-name" value="PhoneSnippet.apk" />
+    </target_preparer>
+  </device>
+
+  <device name="phone_notpaired">
+    <!-- Build Provider -->
+    <build_provider class="com.android.compatibility.common.tradefed.build.CompatibilityBuildProvider" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller" >
+      <option name="test-file-name" value="PhoneSnippet.apk" />
+    </target_preparer>
+  </device>
+</configuration>
\ No newline at end of file
diff --git a/tools/catbox-tradefed/res/config/device-config/two-devices.xml b/tools/catbox-tradefed/res/config/device-config/two-devices.xml
new file mode 100644
index 0000000..9c2ab57
--- /dev/null
+++ b/tools/catbox-tradefed/res/config/device-config/two-devices.xml
@@ -0,0 +1,29 @@
+<?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.
+-->
+<configuration description="Bluetooth Device Configuration For Two Devices">
+  <device name="auto" >
+    <!-- Build Provider -->
+    <build_provider class="com.android.compatibility.common.tradefed.build.CompatibilityBuildProvider" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller" >
+      <option name="test-file-name" value="AutomotiveSnippet.apk" />
+    </target_preparer>
+  </device>
+
+  <device name="phone">
+    <!-- Build Provider -->
+    <build_provider class="com.android.compatibility.common.tradefed.build.CompatibilityBuildProvider" />
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller" >
+      <option name="test-file-name" value="PhoneSnippet.apk" />
+    </target_preparer>
+  </device>
+</configuration>
\ No newline at end of file
-- 
cgit v1.2.3


From 9969dd48b85cac40e503aa020c654c826dcdff55 Mon Sep 17 00:00:00 2001
From: vitalidim <vitalidim@google.com>
Date: Thu, 16 Nov 2023 16:10:17 -0800
Subject: Add `GoogleAccountPreparer` to Seahawk and phone devices

BUG: 308849670
Change-Id: I0617cc9d80ec83f091bac177871e7b40da317177
---
 .../res/config/catbox-functional-bluetooth-tests.xml     | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/tools/catbox-tradefed/res/config/catbox-functional-bluetooth-tests.xml b/tools/catbox-tradefed/res/config/catbox-functional-bluetooth-tests.xml
index b1dcd97..02365ed 100644
--- a/tools/catbox-tradefed/res/config/catbox-functional-bluetooth-tests.xml
+++ b/tools/catbox-tradefed/res/config/catbox-functional-bluetooth-tests.xml
@@ -20,6 +20,22 @@
 
   <include name="everything" />
 
+  <!-- Device 1 configurations -->
+  <device name="device1">
+    <!-- Optionally do not add google account by default -->
+    <target_preparer class="com.google.android.tradefed.targetprep.GoogleAccountPreparer">
+      <option name="disable" value="true" />
+    </target_preparer>
+  </device>
+
+  <!-- Device 2 configurations -->
+  <device name="device2">
+    !-- Optionally do not add google account by default -->
+    <target_preparer class="com.google.android.tradefed.targetprep.GoogleAccountPreparer">
+      <option name="disable" value="true" />
+    </target_preparer>
+  </device>
+
   <!-- Template for Result Reporters -->
   <template-include name="reporters" default="empty" />
 
-- 
cgit v1.2.3


From 7d113f8fa21fb57feacc47b4753d15c1fa7f784d Mon Sep 17 00:00:00 2001
From: Vitali Dim <vitalidim@google.com>
Date: Fri, 17 Nov 2023 18:38:34 +0000
Subject: Revert "Add `GoogleAccountPreparer` to Seahawk and phone devices"

This reverts commit 9969dd48b85cac40e503aa020c654c826dcdff55.

Reason for revert: part of google-tradefed which is internal only and so we cannot use that in AOSP CATBox

Change-Id: I5c7bba550b1396e16966eaaf7b77a76193ac41e5
---
 .../res/config/catbox-functional-bluetooth-tests.xml     | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/tools/catbox-tradefed/res/config/catbox-functional-bluetooth-tests.xml b/tools/catbox-tradefed/res/config/catbox-functional-bluetooth-tests.xml
index 02365ed..b1dcd97 100644
--- a/tools/catbox-tradefed/res/config/catbox-functional-bluetooth-tests.xml
+++ b/tools/catbox-tradefed/res/config/catbox-functional-bluetooth-tests.xml
@@ -20,22 +20,6 @@
 
   <include name="everything" />
 
-  <!-- Device 1 configurations -->
-  <device name="device1">
-    <!-- Optionally do not add google account by default -->
-    <target_preparer class="com.google.android.tradefed.targetprep.GoogleAccountPreparer">
-      <option name="disable" value="true" />
-    </target_preparer>
-  </device>
-
-  <!-- Device 2 configurations -->
-  <device name="device2">
-    !-- Optionally do not add google account by default -->
-    <target_preparer class="com.google.android.tradefed.targetprep.GoogleAccountPreparer">
-      <option name="disable" value="true" />
-    </target_preparer>
-  </device>
-
   <!-- Template for Result Reporters -->
   <template-include name="reporters" default="empty" />
 
-- 
cgit v1.2.3