1 files changed, 48 insertions, 20 deletions
diff --git a/adservices/tests/cts/endtoends/permissions/valid/AndroidTest.xml b/adservices/tests/cts/endtoends/permissions/valid/AndroidTest.xml
index 4c9bb47078..901460ad0b 100644
--- a/adservices/tests/cts/endtoends/permissions/valid/AndroidTest.xml
+++ b/adservices/tests/cts/endtoends/permissions/valid/AndroidTest.xml
@@ -15,24 +15,52 @@
   ~ limitations under the License.
   -->
 <configuration description="Config for Cts Ad Services Permissions E2E tests">
-<option name="test-suite-tag" value="cts" />
-<option name="test-tag" value="CtsAdServicesPermissionsValidEndToEndTests" />
-<option name="config-descriptor:metadata" key="component" value="framework"/>
-<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.suite.SuiteApkInstaller">
-    <option name="cleanup-apks" value="true"/>
-    <option name="test-file-name" value="CtsAdServicesPermissionsValidEndToEndTests.apk"/>
-</target_preparer>
-
-<test class="com.android.tradefed.testtype.AndroidJUnitTest">
-    <option name="package" value="com.android.adservices.tests.permissions.valid"/>
-</test>
-
-<object type="module_controller"
-        class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
-    <option name="mainline-module-package-name" value="com.google.android.adservices"/>
-</object>
+    <option name="test-suite-tag" value="cts" />
+    <option name="test-tag" value="CtsAdServicesPermissionsValidEndToEndTests" />
+    <option name="config-descriptor:metadata" key="component" value="framework"/>
+    <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.suite.SuiteApkInstaller">
+        <option name="cleanup-apks" value="true"/>
+        <option name="test-file-name" value="CtsAdServicesPermissionsValidEndToEndTests.apk"/>
+    </target_preparer>
+
+    <target_preparer class="com.android.tradefed.targetprep.DeviceSetup" >
+        <option name="force-skip-system-props" value="true" />
+        <option name="disable-device-config-sync" value="true" />
+    </target_preparer>
+
+    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
+        <!-- Disable kill switches to ignore the effect of actual PH values. -->
+        <option name="run-command" value="setprop debug.adservices.global_kill_switch false" />
+        <option name="run-command" value="setprop debug.adservices.fledge_select_ads_kill_switch false" />
+        <option name="run-command" value="setprop debug.adservices.fledge_custom_audience_service_kill_switch false" />
+        <option name="run-command" value="device_config put adservices topics_kill_switch false" />
+
+        <!-- Override Consent Manager to debug mode to grant user consent -->
+        <option name="run-command" value="setprop debug.adservices.consent_manager_debug_mode true" />
+        <option name="teardown-command" value="setprop debug.adservices.consent_manager_debug_mode false"/>
+
+        <!-- Force enable enrollment checks when testing enrollment -->
+        <option name="run-command" value="setprop debug.adservices.disable_fledge_enrollment_check false" />
+        <option name="run-command" value="setprop debug.adservices.disable_topics_enrollment_check true" />
+        <option name="teardown-command" value="setprop debug.adservices.disable_topics_enrollment_check false" />
+
+        <option name="run-command" value="setprop log.tag.adservices VERBOSE" />
+
+        <!-- Increase the allowed API queries per second -->
+        <option name="run-command" value="setprop debug.adservices.sdk_request_permits_per_second 1000" />
+        <option name="teardown-command" value="setprop debug.adservices.sdk_request_permits_per_second 1" />
+    </target_preparer>
+
+    <test class="com.android.tradefed.testtype.AndroidJUnitTest">
+        <option name="package" value="com.android.adservices.tests.permissions.valid"/>
+    </test>
+
+    <object type="module_controller"
+            class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController">
+        <option name="mainline-module-package-name" value="com.google.android.adservices"/>
+    </object>
 </configuration>