Snap for 8512216 from 5abeb03a64d1f6e517834368ac854f515a265fb9 to tm-frc-adbd-releaset_frc_adb_330444000android13-frc-adbd-release

Change-Id: I021493ce9219797ba662632d345e017e09805cc0

5 files changed, 37 insertions, 13 deletions

diff --git a/tools/catbox-common/res/config/catbox-performance-base.xml b/tools/catbox-common/res/config/catbox-performance-base.xml
index 17bd214..6109552 100644
--- a/tools/catbox-common/res/config/catbox-performance-base.xml
+++ b/tools/catbox-common/res/config/catbox-performance-base.xml
@@ -31,7 +31,6 @@
   <option name="test-tag-suffix" value="performance" />
 
   <!-- Performance Specific Target Preparers -->
-  <target_preparer class="com.android.tradefed.targetprep.PushFilePreparer" />
   <target_preparer class="com.android.tradefed.targetprep.PerfettoPreparer" />
   <target_preparer class="com.android.tradefed.targetprep.TimeWaster" />
   <target_preparer class="com.android.compatibility.common.tradefed.targetprep.ReportLogCollector">
diff --git a/tools/catbox-common/res/config/catbox-preparer.xml b/tools/catbox-common/res/config/catbox-preparer.xml
index d7667ed..db9aaf7 100644
--- a/tools/catbox-common/res/config/catbox-preparer.xml
+++ b/tools/catbox-common/res/config/catbox-preparer.xml
@@ -14,14 +14,6 @@
      limitations under the License.
 -->
 <configuration description="CATBOX Target Preparer Configuration">
-  <!-- Target Preparers - Add System User and Disable By Default -->
-  <target_preparer class="com.android.tradefed.targetprep.RunOnSystemUserTargetPreparer">
-    <option name="disable" value="true" />
-  </target_preparer>
-
-  <!-- Target Preparers - Disable SELinux before Test Execution -->
-  <target_preparer class="com.android.tradefed.targetprep.DisableSELinuxTargetPreparer" />
-
   <!-- Target Preparers - Clean the Device after Test Execution -->
   <target_preparer class="com.android.tradefed.targetprep.DeviceCleaner">
     <option name="disable" value="true" />
@@ -42,6 +34,17 @@
     <option name="set-secure-setting" key="location_mode" value="1" />
   </target_preparer>
 
+  <!-- Target Preparers - ADB Root -->
+  <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer" />
+
+  <!-- Target Preparers - Add System User and Disable By Default -->
+  <target_preparer class="com.android.tradefed.targetprep.RunOnSystemUserTargetPreparer">
+    <option name="disable" value="true" />
+  </target_preparer>
+
+  <!-- Target Preparers - Disable SELinux before Test Execution -->
+  <target_preparer class="com.android.tradefed.targetprep.DisableSELinuxTargetPreparer" />
+
   <!-- Target Preparers - Install Apps -->
   <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup" >
     <option name="cleanup-apks" value="true" />
diff --git a/tools/catbox-tradefed/Android.bp b/tools/catbox-tradefed/Android.bp
index ccba6af..493e19c 100644
--- a/tools/catbox-tradefed/Android.bp
+++ b/tools/catbox-tradefed/Android.bp
@@ -16,6 +16,19 @@ package {
     default_applicable_licenses: ["Android-Apache-2.0"],
 }
 
+java_library_host {
+    name: "catbox-tradefed-lib",
+    java_resource_dirs: ["res"],
+    static_libs: [
+        "cts-tradefed-harness",
+        "catbox-common",
+        "catbox-preparer-lib",
+        "catbox-report-lib"
+    ],
+    required: ["compatibility-host-util"],
+}
+
+
 tradefed_binary_host {
     name: "catbox-tradefed",
     java_resource_dirs: ["res"],
@@ -23,6 +36,13 @@ tradefed_binary_host {
     short_name: "CATBOX",
     full_name: "Complete Automotive Test in a Box",
     version: "1.0",
-    static_libs: ["cts-tradefed-harness", "catbox-common", "catbox-preparer-lib"],
-    required: ["compatibility-host-util", "catbox-report-lib"],
+    static_libs: [
+        "cts-tradefed-harness",
+        "catbox-common",
+        "catbox-preparer-lib"
+    ],
+    required: [
+        "compatibility-host-util",
+        "catbox-report-lib"
+    ],
 }
diff --git a/tools/catbox-tradefed/res/config/catbox-functional-multiuser-system-user.xml b/tools/catbox-tradefed/res/config/catbox-functional-multiuser-system-user.xml
index 3eb46e3..b214a80 100644
--- a/tools/catbox-tradefed/res/config/catbox-functional-multiuser-system-user.xml
+++ b/tools/catbox-tradefed/res/config/catbox-functional-multiuser-system-user.xml
@@ -34,5 +34,7 @@
   <!-- Tests -->
   <option name="compatibility:include-filter" value="AndroidAutomotiveMultiuserTests android.platform.tests.DeleteCurrentNonAdminUser" />
   <option name="compatibility:include-filter" value="AndroidAutomotiveMultiuserTests android.platform.tests.SwitchToGuestFromNonAdmin" />
+<!--
   <option name="compatibility:include-filter" value="AndroidAutomotiveMultiuserTests android.platform.tests.DeleteLastAdminUser" />
-</configuration>
+-->
+</configuration>
\ No newline at end of file
diff --git a/tools/catbox-tradefed/res/config/catbox-functional-multiuser.xml b/tools/catbox-tradefed/res/config/catbox-functional-multiuser.xml
index 921e626..a3d0d0e 100644
--- a/tools/catbox-tradefed/res/config/catbox-functional-multiuser.xml
+++ b/tools/catbox-tradefed/res/config/catbox-functional-multiuser.xml
@@ -24,7 +24,7 @@
   <option name="plan" value="catbox-functional-multiuser"/>
 
   <!-- adb shell command specific to multiuser tests -->
-  <option name="run-command:run-command" value="setprop fw.stop_bg_users_on_switch 0" />
+  <option name="run-command:run-command" value="cmd activity set-stop-user-on-switch false" />
 
   <!-- Test Args -->
   <option name="compatibility:test-arg" value="com.android.tradefed.testtype.AndroidJUnitTest:runner:androidx.test.runner.AndroidJUnitRunner" />