Update preparers to align across everything

Carry the exact same options.

Test: presubmit
Bug: 261855411
Change-Id: Id06ecb610708946c1e57da0df47a00b4794e5a34

8 files changed, 8 insertions, 8 deletions

diff --git a/PermissionController/tests/inprocess/AndroidTest.xml b/PermissionController/tests/inprocess/AndroidTest.xml
index 403e320a3..8971a7270 100644
--- a/PermissionController/tests/inprocess/AndroidTest.xml
+++ b/PermissionController/tests/inprocess/AndroidTest.xml
@@ -23,7 +23,7 @@
     <object type="module_controller" class="com.android.tradefed.testtype.suite.module.Sdk30ModuleController" />
 
     <!-- Install test -->
-    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="test-file-name" value="PermissionControllerInProcessTests.apk" />
         <option name="cleanup-apks" value="true" />
     </target_preparer>
diff --git a/PermissionController/tests/mocking/AndroidTest.xml b/PermissionController/tests/mocking/AndroidTest.xml
index 58147c1b7..26755923a 100644
--- a/PermissionController/tests/mocking/AndroidTest.xml
+++ b/PermissionController/tests/mocking/AndroidTest.xml
@@ -23,7 +23,7 @@
     <object type="module_controller" class="com.android.tradefed.testtype.suite.module.Sdk30ModuleController" />
 
     <!-- Install test -->
-    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="test-file-name" value="PermissionControllerMockingTests.apk" />
         <option name="cleanup-apks" value="true" />
     </target_preparer>
diff --git a/PermissionController/tests/outofprocess/AndroidTest.xml b/PermissionController/tests/outofprocess/AndroidTest.xml
index c47b78eab..37b8996ff 100644
--- a/PermissionController/tests/outofprocess/AndroidTest.xml
+++ b/PermissionController/tests/outofprocess/AndroidTest.xml
@@ -23,7 +23,7 @@
     <object type="module_controller" class="com.android.tradefed.testtype.suite.module.Sdk30ModuleController" />
 
     <!-- Install test -->
-    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="test-file-name" value="PermissionControllerOutOfProcessTests.apk" />
         <option name="cleanup-apks" value="true" />
     </target_preparer>
diff --git a/PermissionController/tests/permissionui/AndroidTest.xml b/PermissionController/tests/permissionui/AndroidTest.xml
index 34a56286e..7c759ed29 100644
--- a/PermissionController/tests/permissionui/AndroidTest.xml
+++ b/PermissionController/tests/permissionui/AndroidTest.xml
@@ -23,7 +23,7 @@
     <object type="module_controller" class="com.android.tradefed.testtype.suite.module.Sdk30ModuleController" />
 
     <!-- Install test -->
-    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="test-file-name" value="PermissionUiTestCases.apk" />
         <option name="cleanup-apks" value="true" />
     </target_preparer>
diff --git a/SafetyCenter/Config/tests/AndroidTest.xml b/SafetyCenter/Config/tests/AndroidTest.xml
index ecb6210e7..cac418d5d 100644
--- a/SafetyCenter/Config/tests/AndroidTest.xml
+++ b/SafetyCenter/Config/tests/AndroidTest.xml
@@ -21,7 +21,7 @@
     <object type="module_controller" class="com.android.tradefed.testtype.suite.module.Sdk33ModuleController" />
 
     <!-- Install test -->
-    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="test-file-name" value="SafetyCenterConfigTests.apk" />
         <option name="cleanup-apks" value="true" />
     </target_preparer>
diff --git a/SafetyCenter/Persistence/tests/AndroidTest.xml b/SafetyCenter/Persistence/tests/AndroidTest.xml
index 3a11886be..007330bd7 100644
--- a/SafetyCenter/Persistence/tests/AndroidTest.xml
+++ b/SafetyCenter/Persistence/tests/AndroidTest.xml
@@ -21,7 +21,7 @@
     <object type="module_controller" class="com.android.tradefed.testtype.suite.module.Sdk33ModuleController" />
 
     <!-- Install test -->
-    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="test-file-name" value="SafetyCenterPersistenceTests.apk" />
         <option name="cleanup-apks" value="true" />
     </target_preparer>
diff --git a/SafetyCenter/ResourcesLib/tests/AndroidTest.xml b/SafetyCenter/ResourcesLib/tests/AndroidTest.xml
index 992468e8d..11d2e75dd 100644
--- a/SafetyCenter/ResourcesLib/tests/AndroidTest.xml
+++ b/SafetyCenter/ResourcesLib/tests/AndroidTest.xml
@@ -23,7 +23,7 @@
     <object type="module_controller" class="com.android.tradefed.testtype.suite.module.Sdk33ModuleController" />
 
     <!-- Install test and resources -->
-    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="test-file-name" value="SafetyCenterResourcesLibTests.apk" />
         <option name="test-file-name" value="SafetyCenterResourcesLibTestResources.apk" />
         <option name="cleanup-apks" value="true" />
diff --git a/tests/apex/AndroidTest.xml b/tests/apex/AndroidTest.xml
index 283f008a5..b1af0f53e 100644
--- a/tests/apex/AndroidTest.xml
+++ b/tests/apex/AndroidTest.xml
@@ -23,7 +23,7 @@
     <object type="module_controller" class="com.android.tradefed.testtype.suite.module.Sdk30ModuleController" />
 
     <!-- Install test -->
-    <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup">
+    <target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
         <option name="test-file-name" value="PermissionApexTests.apk" />
         <option name="cleanup-apks" value="true" />
     </target_preparer>