Disable GPP for the tests.
These are supposed to be enabled for all test runs. Sometimes infra changes break global settings. To be on a safe side, hardcode the GPP disablements into individual suites' configs.
Fixes: 293674107
Fixes: 293690961
Fixes: 293412917
Fixes: 293179601
Fixes: 292866833
Fixes: 292531584
Fixes: 292244143
Fixes: 293429925
Test: presubmit
Change-Id: I04bfa28cc2ced2ecf02794228a8b06e5f7b25050
diff --git a/hostsidetests/appsecurity/CorruptApkTests.xml b/hostsidetests/appsecurity/CorruptApkTests.xml
index 622f0f5..1cee0fb 100644
--- a/hostsidetests/appsecurity/CorruptApkTests.xml
+++ b/hostsidetests/appsecurity/CorruptApkTests.xml
@@ -24,9 +24,11 @@
<option name="run-command" value="setprop debug.wm.disable_deprecated_abi_dialog 1" />
</target_preparer>
<!-- disable GPP UI -->
- <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
- <option name="run-command" value="settings put global verifier_engprod 1" />
- <option name="teardown-command" value="settings put global verifier_engprod 0"/>
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+ <option name="force-skip-system-props" value="true" />
+ <option name="set-global-setting" key="verifier_engprod" value="1" />
+ <option name="set-global-setting" key="verifier_verify_adb_installs" value="0" />
+ <option name="restore-settings" value="true" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsCorruptApkHostTestCases.jar" />
diff --git a/hostsidetests/appsecurity/DirectBootTests.xml b/hostsidetests/appsecurity/DirectBootTests.xml
index 68082fd..40d069c 100644
--- a/hostsidetests/appsecurity/DirectBootTests.xml
+++ b/hostsidetests/appsecurity/DirectBootTests.xml
@@ -24,9 +24,11 @@
<option name="run-command" value="setprop debug.wm.disable_deprecated_abi_dialog 1" />
</target_preparer>
<!-- disable GPP UI -->
- <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
- <option name="run-command" value="settings put global verifier_engprod 1" />
- <option name="teardown-command" value="settings put global verifier_engprod 0"/>
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+ <option name="force-skip-system-props" value="true" />
+ <option name="set-global-setting" key="verifier_engprod" value="1" />
+ <option name="set-global-setting" key="verifier_verify_adb_installs" value="0" />
+ <option name="restore-settings" value="true" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsDirectBootHostTestCases.jar" />
diff --git a/hostsidetests/appsecurity/DocumentsTests.xml b/hostsidetests/appsecurity/DocumentsTests.xml
index bd644d6e..c07af28 100644
--- a/hostsidetests/appsecurity/DocumentsTests.xml
+++ b/hostsidetests/appsecurity/DocumentsTests.xml
@@ -24,9 +24,11 @@
<option name="run-command" value="setprop debug.wm.disable_deprecated_abi_dialog 1" />
</target_preparer>
<!-- disable GPP UI -->
- <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
- <option name="run-command" value="settings put global verifier_engprod 1" />
- <option name="teardown-command" value="settings put global verifier_engprod 0"/>
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+ <option name="force-skip-system-props" value="true" />
+ <option name="set-global-setting" key="verifier_engprod" value="1" />
+ <option name="set-global-setting" key="verifier_verify_adb_installs" value="0" />
+ <option name="restore-settings" value="true" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsDocumentsHostTestCases.jar" />
diff --git a/hostsidetests/appsecurity/InstantAppsTests.xml b/hostsidetests/appsecurity/InstantAppsTests.xml
index 10713d2..d1c4ed0 100644
--- a/hostsidetests/appsecurity/InstantAppsTests.xml
+++ b/hostsidetests/appsecurity/InstantAppsTests.xml
@@ -24,9 +24,11 @@
<option name="run-command" value="setprop debug.wm.disable_deprecated_abi_dialog 1" />
</target_preparer>
<!-- disable GPP UI -->
- <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
- <option name="run-command" value="settings put global verifier_engprod 1" />
- <option name="teardown-command" value="settings put global verifier_engprod 0"/>
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+ <option name="force-skip-system-props" value="true" />
+ <option name="set-global-setting" key="verifier_engprod" value="1" />
+ <option name="set-global-setting" key="verifier_verify_adb_installs" value="0" />
+ <option name="restore-settings" value="true" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsInstantAppsHostTestCases.jar" />
diff --git a/hostsidetests/appsecurity/OverlayTests.xml b/hostsidetests/appsecurity/OverlayTests.xml
index 2593c75..de0f12a 100644
--- a/hostsidetests/appsecurity/OverlayTests.xml
+++ b/hostsidetests/appsecurity/OverlayTests.xml
@@ -24,9 +24,11 @@
<option name="run-command" value="setprop debug.wm.disable_deprecated_abi_dialog 1" />
</target_preparer>
<!-- disable GPP UI -->
- <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
- <option name="run-command" value="settings put global verifier_engprod 1" />
- <option name="teardown-command" value="settings put global verifier_engprod 0"/>
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+ <option name="force-skip-system-props" value="true" />
+ <option name="set-global-setting" key="verifier_engprod" value="1" />
+ <option name="set-global-setting" key="verifier_verify_adb_installs" value="0" />
+ <option name="restore-settings" value="true" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsOverlayHostTestCases.jar" />
diff --git a/hostsidetests/appsecurity/PackageManagerTests.xml b/hostsidetests/appsecurity/PackageManagerTests.xml
index e5e6d91..030def2 100644
--- a/hostsidetests/appsecurity/PackageManagerTests.xml
+++ b/hostsidetests/appsecurity/PackageManagerTests.xml
@@ -31,9 +31,11 @@
<option name="run-command" value="setprop debug.wm.disable_deprecated_abi_dialog 1" />
</target_preparer>
<!-- disable GPP UI -->
- <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
- <option name="run-command" value="settings put global verifier_engprod 1" />
- <option name="teardown-command" value="settings put global verifier_engprod 0"/>
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+ <option name="force-skip-system-props" value="true" />
+ <option name="set-global-setting" key="verifier_engprod" value="1" />
+ <option name="set-global-setting" key="verifier_verify_adb_installs" value="0" />
+ <option name="restore-settings" value="true" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsPackageManagerHostTestCases.jar" />
diff --git a/hostsidetests/appsecurity/PermissionsTests.xml b/hostsidetests/appsecurity/PermissionsTests.xml
index 8267a0e..8a0a8cf 100644
--- a/hostsidetests/appsecurity/PermissionsTests.xml
+++ b/hostsidetests/appsecurity/PermissionsTests.xml
@@ -24,9 +24,11 @@
<option name="run-command" value="setprop debug.wm.disable_deprecated_abi_dialog 1" />
</target_preparer>
<!-- disable GPP UI -->
- <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
- <option name="run-command" value="settings put global verifier_engprod 1" />
- <option name="teardown-command" value="settings put global verifier_engprod 0"/>
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+ <option name="force-skip-system-props" value="true" />
+ <option name="set-global-setting" key="verifier_engprod" value="1" />
+ <option name="set-global-setting" key="verifier_verify_adb_installs" value="0" />
+ <option name="restore-settings" value="true" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsPermissionsHostTestCases.jar" />
diff --git a/hostsidetests/appsecurity/ResumeOnRebootTests.xml b/hostsidetests/appsecurity/ResumeOnRebootTests.xml
index b187029..e19bc9e 100644
--- a/hostsidetests/appsecurity/ResumeOnRebootTests.xml
+++ b/hostsidetests/appsecurity/ResumeOnRebootTests.xml
@@ -25,9 +25,11 @@
<option name="run-command" value="setprop debug.wm.disable_deprecated_abi_dialog 1" />
</target_preparer>
<!-- disable GPP UI -->
- <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
- <option name="run-command" value="settings put global verifier_engprod 1" />
- <option name="teardown-command" value="settings put global verifier_engprod 0"/>
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+ <option name="force-skip-system-props" value="true" />
+ <option name="set-global-setting" key="verifier_engprod" value="1" />
+ <option name="set-global-setting" key="verifier_verify_adb_installs" value="0" />
+ <option name="restore-settings" value="true" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsResumeOnRebootHostTestCases.jar" />
diff --git a/hostsidetests/appsecurity/StorageTests.xml b/hostsidetests/appsecurity/StorageTests.xml
index 0441aeb..0bc5539 100644
--- a/hostsidetests/appsecurity/StorageTests.xml
+++ b/hostsidetests/appsecurity/StorageTests.xml
@@ -24,9 +24,11 @@
<option name="run-command" value="setprop debug.wm.disable_deprecated_abi_dialog 1" />
</target_preparer>
<!-- disable GPP UI -->
- <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
- <option name="run-command" value="settings put global verifier_engprod 1" />
- <option name="teardown-command" value="settings put global verifier_engprod 0"/>
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+ <option name="force-skip-system-props" value="true" />
+ <option name="set-global-setting" key="verifier_engprod" value="1" />
+ <option name="set-global-setting" key="verifier_verify_adb_installs" value="0" />
+ <option name="restore-settings" value="true" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsStorageHostTestCases.jar" />
diff --git a/hostsidetests/appsecurity/UseEmbeddedDexTests.xml b/hostsidetests/appsecurity/UseEmbeddedDexTests.xml
index 04c4e91..c27f824 100644
--- a/hostsidetests/appsecurity/UseEmbeddedDexTests.xml
+++ b/hostsidetests/appsecurity/UseEmbeddedDexTests.xml
@@ -24,9 +24,11 @@
<option name="run-command" value="setprop debug.wm.disable_deprecated_abi_dialog 1" />
</target_preparer>
<!-- disable GPP UI -->
- <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
- <option name="run-command" value="settings put global verifier_engprod 1" />
- <option name="teardown-command" value="settings put global verifier_engprod 0"/>
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+ <option name="force-skip-system-props" value="true" />
+ <option name="set-global-setting" key="verifier_engprod" value="1" />
+ <option name="set-global-setting" key="verifier_verify_adb_installs" value="0" />
+ <option name="restore-settings" value="true" />
</target_preparer>
<test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
<option name="jar" value="CtsUseEmbeddedDexHostTestCases.jar" />
diff --git a/hostsidetests/install/AndroidTest.xml b/hostsidetests/install/AndroidTest.xml
index 1eae5f6..47fbdcd 100644
--- a/hostsidetests/install/AndroidTest.xml
+++ b/hostsidetests/install/AndroidTest.xml
@@ -22,6 +22,12 @@
<!-- TODO(b/137885984): Revisit secondary user eligibility once the issue is resolved. -->
<option name="config-descriptor:metadata" key="parameter" value="not_secondary_user" />
<option name="config-descriptor:metadata" key="parameter" value="no_foldable_states" />
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+ <option name="force-skip-system-props" value="true" />
+ <option name="set-global-setting" key="verifier_engprod" value="1" />
+ <option name="set-global-setting" key="verifier_verify_adb_installs" value="0" />
+ <option name="restore-settings" value="true" />
+ </target_preparer>
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="InstallTest.apk" />
diff --git a/hostsidetests/packagemanager/dynamicmime/AndroidTest.xml b/hostsidetests/packagemanager/dynamicmime/AndroidTest.xml
index 62f681e..c41a043 100644
--- a/hostsidetests/packagemanager/dynamicmime/AndroidTest.xml
+++ b/hostsidetests/packagemanager/dynamicmime/AndroidTest.xml
@@ -29,10 +29,18 @@
<option name="test-file-name" value="CtsDynamicMimeTestApp.apk" />
</target_preparer>
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+ <option name="force-skip-system-props" value="true" />
+ <option name="set-global-setting" key="verifier_engprod" value="1" />
+ <option name="set-global-setting" key="verifier_verify_adb_installs" value="0" />
+ <option name="restore-settings" value="true" />
+ </target_preparer>
+
<target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
<option name="run-command" value="mkdir -p /data/local/tmp/dynamic-mime-test" />
<option name="teardown-command" value="rm -rf /data/local/tmp/dynamic-mime-test"/>
</target_preparer>
+
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
<option name="cleanup" value="true" />
<option name="push" value="CtsDynamicMimeUpdateAppFirstGroup.apk->/data/local/tmp/dynamic-mime-test/CtsDynamicMimeUpdateAppFirstGroup.apk"/>
diff --git a/hostsidetests/packagemanager/dynamicmime/ChangedGroupsAppUpdateTestCases.xml b/hostsidetests/packagemanager/dynamicmime/ChangedGroupsAppUpdateTestCases.xml
index 8df2063..c9570ea 100644
--- a/hostsidetests/packagemanager/dynamicmime/ChangedGroupsAppUpdateTestCases.xml
+++ b/hostsidetests/packagemanager/dynamicmime/ChangedGroupsAppUpdateTestCases.xml
@@ -29,10 +29,18 @@
<option name="test-file-name" value="CtsDynamicMimeTestApp.apk" />
</target_preparer>
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+ <option name="force-skip-system-props" value="true" />
+ <option name="set-global-setting" key="verifier_engprod" value="1" />
+ <option name="set-global-setting" key="verifier_verify_adb_installs" value="0" />
+ <option name="restore-settings" value="true" />
+ </target_preparer>
+
<target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
<option name="run-command" value="mkdir -p /data/local/tmp/dynamic-mime-test" />
<option name="teardown-command" value="rm -rf /data/local/tmp/dynamic-mime-test"/>
</target_preparer>
+
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
<option name="cleanup" value="true" />
<option name="push" value="CtsDynamicMimeUpdateAppFirstGroup.apk->/data/local/tmp/dynamic-mime-test/CtsDynamicMimeUpdateAppFirstGroup.apk"/>
diff --git a/hostsidetests/packagemanager/dynamicmime/ComplexFilterClearGroupRebootTestCases.xml b/hostsidetests/packagemanager/dynamicmime/ComplexFilterClearGroupRebootTestCases.xml
index 10e4a42..1163847 100644
--- a/hostsidetests/packagemanager/dynamicmime/ComplexFilterClearGroupRebootTestCases.xml
+++ b/hostsidetests/packagemanager/dynamicmime/ComplexFilterClearGroupRebootTestCases.xml
@@ -29,10 +29,18 @@
<option name="test-file-name" value="CtsDynamicMimeTestApp.apk" />
</target_preparer>
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+ <option name="force-skip-system-props" value="true" />
+ <option name="set-global-setting" key="verifier_engprod" value="1" />
+ <option name="set-global-setting" key="verifier_verify_adb_installs" value="0" />
+ <option name="restore-settings" value="true" />
+ </target_preparer>
+
<target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
<option name="run-command" value="mkdir -p /data/local/tmp/dynamic-mime-test" />
<option name="teardown-command" value="rm -rf /data/local/tmp/dynamic-mime-test"/>
</target_preparer>
+
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
<option name="cleanup" value="true" />
<option name="push" value="CtsDynamicMimeUpdateAppFirstGroup.apk->/data/local/tmp/dynamic-mime-test/CtsDynamicMimeUpdateAppFirstGroup.apk"/>
diff --git a/hostsidetests/packagemanager/dynamicmime/ComplexFilterRebootTestCases.xml b/hostsidetests/packagemanager/dynamicmime/ComplexFilterRebootTestCases.xml
index ab7f841..a669a0d 100644
--- a/hostsidetests/packagemanager/dynamicmime/ComplexFilterRebootTestCases.xml
+++ b/hostsidetests/packagemanager/dynamicmime/ComplexFilterRebootTestCases.xml
@@ -29,10 +29,18 @@
<option name="test-file-name" value="CtsDynamicMimeTestApp.apk" />
</target_preparer>
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+ <option name="force-skip-system-props" value="true" />
+ <option name="set-global-setting" key="verifier_engprod" value="1" />
+ <option name="set-global-setting" key="verifier_verify_adb_installs" value="0" />
+ <option name="restore-settings" value="true" />
+ </target_preparer>
+
<target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
<option name="run-command" value="mkdir -p /data/local/tmp/dynamic-mime-test" />
<option name="teardown-command" value="rm -rf /data/local/tmp/dynamic-mime-test"/>
</target_preparer>
+
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
<option name="cleanup" value="true" />
<option name="push" value="CtsDynamicMimeUpdateAppFirstGroup.apk->/data/local/tmp/dynamic-mime-test/CtsDynamicMimeUpdateAppFirstGroup.apk"/>
diff --git a/hostsidetests/packagemanager/dynamicmime/IndependentGroupRebootTestCases.xml b/hostsidetests/packagemanager/dynamicmime/IndependentGroupRebootTestCases.xml
index d469163..3f95414 100644
--- a/hostsidetests/packagemanager/dynamicmime/IndependentGroupRebootTestCases.xml
+++ b/hostsidetests/packagemanager/dynamicmime/IndependentGroupRebootTestCases.xml
@@ -29,10 +29,18 @@
<option name="test-file-name" value="CtsDynamicMimeTestApp.apk" />
</target_preparer>
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+ <option name="force-skip-system-props" value="true" />
+ <option name="set-global-setting" key="verifier_engprod" value="1" />
+ <option name="set-global-setting" key="verifier_verify_adb_installs" value="0" />
+ <option name="restore-settings" value="true" />
+ </target_preparer>
+
<target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
<option name="run-command" value="mkdir -p /data/local/tmp/dynamic-mime-test" />
<option name="teardown-command" value="rm -rf /data/local/tmp/dynamic-mime-test"/>
</target_preparer>
+
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
<option name="cleanup" value="true" />
<option name="push" value="CtsDynamicMimeUpdateAppFirstGroup.apk->/data/local/tmp/dynamic-mime-test/CtsDynamicMimeUpdateAppFirstGroup.apk"/>
diff --git a/hostsidetests/packagemanager/dynamicmime/PreferredActivitiesTests.xml b/hostsidetests/packagemanager/dynamicmime/PreferredActivitiesTests.xml
index f659234..19d5b3e 100644
--- a/hostsidetests/packagemanager/dynamicmime/PreferredActivitiesTests.xml
+++ b/hostsidetests/packagemanager/dynamicmime/PreferredActivitiesTests.xml
@@ -29,10 +29,18 @@
<option name="test-file-name" value="CtsDynamicMimeTestApp.apk" />
</target_preparer>
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+ <option name="force-skip-system-props" value="true" />
+ <option name="set-global-setting" key="verifier_engprod" value="1" />
+ <option name="set-global-setting" key="verifier_verify_adb_installs" value="0" />
+ <option name="restore-settings" value="true" />
+ </target_preparer>
+
<target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
<option name="run-command" value="mkdir -p /data/local/tmp/dynamic-mime-test" />
<option name="teardown-command" value="rm -rf /data/local/tmp/dynamic-mime-test"/>
</target_preparer>
+
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
<option name="cleanup" value="true" />
<option name="push" value="CtsDynamicMimePreferredApp.apk->/data/local/tmp/dynamic-mime-test/CtsDynamicMimePreferredApp.apk"/>
diff --git a/hostsidetests/packagemanager/dynamicmime/RemoveRebootTestCases.xml b/hostsidetests/packagemanager/dynamicmime/RemoveRebootTestCases.xml
index a08a272..80c6be6 100644
--- a/hostsidetests/packagemanager/dynamicmime/RemoveRebootTestCases.xml
+++ b/hostsidetests/packagemanager/dynamicmime/RemoveRebootTestCases.xml
@@ -29,10 +29,18 @@
<option name="test-file-name" value="CtsDynamicMimeTestApp.apk" />
</target_preparer>
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+ <option name="force-skip-system-props" value="true" />
+ <option name="set-global-setting" key="verifier_engprod" value="1" />
+ <option name="set-global-setting" key="verifier_verify_adb_installs" value="0" />
+ <option name="restore-settings" value="true" />
+ </target_preparer>
+
<target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
<option name="run-command" value="mkdir -p /data/local/tmp/dynamic-mime-test" />
<option name="teardown-command" value="rm -rf /data/local/tmp/dynamic-mime-test"/>
</target_preparer>
+
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
<option name="cleanup" value="true" />
<option name="push" value="CtsDynamicMimeUpdateAppFirstGroup.apk->/data/local/tmp/dynamic-mime-test/CtsDynamicMimeUpdateAppFirstGroup.apk"/>
diff --git a/hostsidetests/packagemanager/dynamicmime/SingleAppGroupRebootTestCases.xml b/hostsidetests/packagemanager/dynamicmime/SingleAppGroupRebootTestCases.xml
index cb48745..a5c6261 100644
--- a/hostsidetests/packagemanager/dynamicmime/SingleAppGroupRebootTestCases.xml
+++ b/hostsidetests/packagemanager/dynamicmime/SingleAppGroupRebootTestCases.xml
@@ -29,10 +29,18 @@
<option name="test-file-name" value="CtsDynamicMimeTestApp.apk" />
</target_preparer>
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+ <option name="force-skip-system-props" value="true" />
+ <option name="set-global-setting" key="verifier_engprod" value="1" />
+ <option name="set-global-setting" key="verifier_verify_adb_installs" value="0" />
+ <option name="restore-settings" value="true" />
+ </target_preparer>
+
<target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
<option name="run-command" value="mkdir -p /data/local/tmp/dynamic-mime-test" />
<option name="teardown-command" value="rm -rf /data/local/tmp/dynamic-mime-test"/>
</target_preparer>
+
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
<option name="cleanup" value="true" />
<option name="push" value="CtsDynamicMimeUpdateAppFirstGroup.apk->/data/local/tmp/dynamic-mime-test/CtsDynamicMimeUpdateAppFirstGroup.apk"/>
diff --git a/hostsidetests/packagemanager/dynamicmime/SingleAppRebootTestCases.xml b/hostsidetests/packagemanager/dynamicmime/SingleAppRebootTestCases.xml
index bbb4f5a..fbc7d62 100644
--- a/hostsidetests/packagemanager/dynamicmime/SingleAppRebootTestCases.xml
+++ b/hostsidetests/packagemanager/dynamicmime/SingleAppRebootTestCases.xml
@@ -29,10 +29,18 @@
<option name="test-file-name" value="CtsDynamicMimeTestApp.apk" />
</target_preparer>
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+ <option name="force-skip-system-props" value="true" />
+ <option name="set-global-setting" key="verifier_engprod" value="1" />
+ <option name="set-global-setting" key="verifier_verify_adb_installs" value="0" />
+ <option name="restore-settings" value="true" />
+ </target_preparer>
+
<target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
<option name="run-command" value="mkdir -p /data/local/tmp/dynamic-mime-test" />
<option name="teardown-command" value="rm -rf /data/local/tmp/dynamic-mime-test"/>
</target_preparer>
+
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
<option name="cleanup" value="true" />
<option name="push" value="CtsDynamicMimeUpdateAppFirstGroup.apk->/data/local/tmp/dynamic-mime-test/CtsDynamicMimeUpdateAppFirstGroup.apk"/>
diff --git a/hostsidetests/packagemanager/installedloadingprogess/AndroidTest.xml b/hostsidetests/packagemanager/installedloadingprogess/AndroidTest.xml
index 7c1850d..1e04d4b 100644
--- a/hostsidetests/packagemanager/installedloadingprogess/AndroidTest.xml
+++ b/hostsidetests/packagemanager/installedloadingprogess/AndroidTest.xml
@@ -21,6 +21,13 @@
<option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
<option name="config-descriptor:metadata" key="parameter" value="no_foldable_states" />
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+ <option name="force-skip-system-props" value="true" />
+ <option name="set-global-setting" key="verifier_engprod" value="1" />
+ <option name="set-global-setting" key="verifier_verify_adb_installs" value="0" />
+ <option name="restore-settings" value="true" />
+ </target_preparer>
+
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsInstalledLoadingProgressDeviceTests.apk" />
diff --git a/tests/suspendapps/tests/AndroidTest.xml b/tests/suspendapps/tests/AndroidTest.xml
index d5455da..3f86524 100644
--- a/tests/suspendapps/tests/AndroidTest.xml
+++ b/tests/suspendapps/tests/AndroidTest.xml
@@ -33,6 +33,13 @@
<option name="test-file-name" value="CtsSuspendTestDeviceAdmin.apk" />
</target_preparer>
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+ <option name="force-skip-system-props" value="true" />
+ <option name="set-global-setting" key="verifier_engprod" value="1" />
+ <option name="set-global-setting" key="verifier_verify_adb_installs" value="0" />
+ <option name="restore-settings" value="true" />
+ </target_preparer>
+
<target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
<!-- This is done to bring the app out of the stopped state -->
<option name="run-command" value="am start -a com.android.suspendapps.suspendtestapp.action.FINISH_TEST_ACTIVITY com.android.suspendapps.suspendtestapp/.SuspendTestActivity" />
diff --git a/tests/tests/notificationlegacy/AndroidTest.xml b/tests/tests/notificationlegacy/AndroidTest.xml
index 571fe44..6bf17da 100644
--- a/tests/tests/notificationlegacy/AndroidTest.xml
+++ b/tests/tests/notificationlegacy/AndroidTest.xml
@@ -18,6 +18,12 @@
<option name="config-descriptor:metadata" key="component" value="framework" />
<!-- Not testing features backed by native code, so only need to run against one ABI -->
<option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+ <option name="force-skip-system-props" value="true" />
+ <option name="set-global-setting" key="verifier_engprod" value="1" />
+ <option name="set-global-setting" key="verifier_verify_adb_installs" value="0" />
+ <option name="restore-settings" value="true" />
+ </target_preparer>
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsLegacyNotificationTestCases.apk" />
diff --git a/tests/tests/notificationlegacy/notificationlegacy20/AndroidTest.xml b/tests/tests/notificationlegacy/notificationlegacy20/AndroidTest.xml
index a6c67d4..456fad5 100644
--- a/tests/tests/notificationlegacy/notificationlegacy20/AndroidTest.xml
+++ b/tests/tests/notificationlegacy/notificationlegacy20/AndroidTest.xml
@@ -22,6 +22,7 @@
<option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
<target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
<option name="force-skip-system-props" value="true" />
+ <option name="set-global-setting" key="verifier_engprod" value="1" />
<option name="set-global-setting" key="verifier_verify_adb_installs" value="0" />
<option name="restore-settings" value="true" />
</target_preparer>
diff --git a/tests/tests/notificationlegacy/notificationlegacy27/AndroidTest.xml b/tests/tests/notificationlegacy/notificationlegacy27/AndroidTest.xml
index fcdb64d..99313a1 100644
--- a/tests/tests/notificationlegacy/notificationlegacy27/AndroidTest.xml
+++ b/tests/tests/notificationlegacy/notificationlegacy27/AndroidTest.xml
@@ -20,6 +20,12 @@
<option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
<option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
<option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+ <option name="force-skip-system-props" value="true" />
+ <option name="set-global-setting" key="verifier_engprod" value="1" />
+ <option name="set-global-setting" key="verifier_verify_adb_installs" value="0" />
+ <option name="restore-settings" value="true" />
+ </target_preparer>
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsLegacyNotification27TestCases.apk" />
diff --git a/tests/tests/notificationlegacy/notificationlegacy28/AndroidTest.xml b/tests/tests/notificationlegacy/notificationlegacy28/AndroidTest.xml
index 7aa0608..7516878 100644
--- a/tests/tests/notificationlegacy/notificationlegacy28/AndroidTest.xml
+++ b/tests/tests/notificationlegacy/notificationlegacy28/AndroidTest.xml
@@ -20,6 +20,12 @@
<option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
<option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
<option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+ <option name="force-skip-system-props" value="true" />
+ <option name="set-global-setting" key="verifier_engprod" value="1" />
+ <option name="set-global-setting" key="verifier_verify_adb_installs" value="0" />
+ <option name="restore-settings" value="true" />
+ </target_preparer>
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsLegacyNotification28TestCases.apk" />
diff --git a/tests/tests/notificationlegacy/notificationlegacy29/AndroidTest.xml b/tests/tests/notificationlegacy/notificationlegacy29/AndroidTest.xml
index 9421128..77b7cdd 100644
--- a/tests/tests/notificationlegacy/notificationlegacy29/AndroidTest.xml
+++ b/tests/tests/notificationlegacy/notificationlegacy29/AndroidTest.xml
@@ -20,6 +20,12 @@
<option name="config-descriptor:metadata" key="parameter" value="not_instant_app" />
<option name="config-descriptor:metadata" key="parameter" value="not_multi_abi" />
<option name="config-descriptor:metadata" key="parameter" value="secondary_user" />
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+ <option name="force-skip-system-props" value="true" />
+ <option name="set-global-setting" key="verifier_engprod" value="1" />
+ <option name="set-global-setting" key="verifier_verify_adb_installs" value="0" />
+ <option name="restore-settings" value="true" />
+ </target_preparer>
<target_preparer class="com.android.tradefed.targetprep.suite.SuiteApkInstaller">
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsLegacyNotification29TestCases.apk" />
diff --git a/tests/tests/notificationlegacy/notificationlegacy30/AndroidTest.xml b/tests/tests/notificationlegacy/notificationlegacy30/AndroidTest.xml
index a1376a3..2e3685c 100644
--- a/tests/tests/notificationlegacy/notificationlegacy30/AndroidTest.xml
+++ b/tests/tests/notificationlegacy/notificationlegacy30/AndroidTest.xml
@@ -24,6 +24,12 @@
<option name="cleanup-apks" value="true" />
<option name="test-file-name" value="CtsLegacyNotification30TestCases.apk" />
</target_preparer>
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+ <option name="force-skip-system-props" value="true" />
+ <option name="set-global-setting" key="verifier_engprod" value="1" />
+ <option name="set-global-setting" key="verifier_verify_adb_installs" value="0" />
+ <option name="restore-settings" value="true" />
+ </target_preparer>
<target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
<option name="run-command" value="input keyevent KEYCODE_WAKEUP" />
<option name="run-command" value="wm dismiss-keyguard" />
diff --git a/tests/tests/packageinstaller/contentprovider/AndroidTestNoVisibility.xml b/tests/tests/packageinstaller/contentprovider/AndroidTestNoVisibility.xml
index 6cb9462..3b950c7 100644
--- a/tests/tests/packageinstaller/contentprovider/AndroidTestNoVisibility.xml
+++ b/tests/tests/packageinstaller/contentprovider/AndroidTestNoVisibility.xml
@@ -31,6 +31,12 @@
<option name="test-file-name" value="CtsExportedContentProvider.apk" />
<option name="test-file-name" value="CtsUnexportedContentProvider.apk" />
</target_preparer>
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+ <option name="force-skip-system-props" value="true" />
+ <option name="set-global-setting" key="verifier_engprod" value="1" />
+ <option name="set-global-setting" key="verifier_verify_adb_installs" value="0" />
+ <option name="restore-settings" value="true" />
+ </target_preparer>
<target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
<option name="run-command" value="input keyevent KEYCODE_WAKEUP" />
<option name="run-command" value="wm dismiss-keyguard" />
diff --git a/tests/tests/packageinstaller/contentprovider/AndroidTestVisibility.xml b/tests/tests/packageinstaller/contentprovider/AndroidTestVisibility.xml
index 4dd6207..6b32b00 100644
--- a/tests/tests/packageinstaller/contentprovider/AndroidTestVisibility.xml
+++ b/tests/tests/packageinstaller/contentprovider/AndroidTestVisibility.xml
@@ -31,6 +31,12 @@
<option name="test-file-name" value="CtsExportedContentProvider.apk" />
<option name="test-file-name" value="CtsUnexportedContentProvider.apk" />
</target_preparer>
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+ <option name="force-skip-system-props" value="true" />
+ <option name="set-global-setting" key="verifier_engprod" value="1" />
+ <option name="set-global-setting" key="verifier_verify_adb_installs" value="0" />
+ <option name="restore-settings" value="true" />
+ </target_preparer>
<target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
<option name="run-command" value="input keyevent KEYCODE_WAKEUP" />
<option name="run-command" value="wm dismiss-keyguard" />
diff --git a/tests/tests/packageinstaller/uninstall/AndroidTest.xml b/tests/tests/packageinstaller/uninstall/AndroidTest.xml
index cabcb22..0a48f7c 100644
--- a/tests/tests/packageinstaller/uninstall/AndroidTest.xml
+++ b/tests/tests/packageinstaller/uninstall/AndroidTest.xml
@@ -39,6 +39,13 @@
<option name="teardown-command" value="rm -rf /data/local/tmp/cts"/>
</target_preparer>
+ <target_preparer class="com.android.tradefed.targetprep.DeviceSetup">
+ <option name="force-skip-system-props" value="true" />
+ <option name="set-global-setting" key="verifier_engprod" value="1" />
+ <option name="set-global-setting" key="verifier_verify_adb_installs" value="0" />
+ <option name="restore-settings" value="true" />
+ </target_preparer>
+
<!-- Load additional APKs onto device -->
<target_preparer class="com.android.compatibility.common.tradefed.targetprep.FilePusher">
<option name="push" value="CtsSelfUninstallingTestApp.apk->/data/local/tmp/cts/uninstall/CtsSelfUninstallingTestApp.apk" />
