From 45b273dd3ddf9ba237f10eca03dcf7ad1510df3e Mon Sep 17 00:00:00 2001
From: hanlixy <hanlixy@google.com>
Date: Tue, 27 Sep 2022 17:34:45 +0000
Subject: Disable Flags sync from PH during the CTS test

Bug: 249287767
Test: atest
Change-Id: I76e5cd7caa0448357b756a475bff845aca001551
---
 adservices/tests/cts/AndroidTest.xml                                | 6 ++++++
 adservices/tests/cts/AndroidTestDebuggable.xml                      | 6 ++++++
 adservices/tests/cts/adid/AndroidTest.xml                           | 5 +++++
 adservices/tests/cts/appsetid/AndroidTest.xml                       | 5 +++++
 adservices/tests/cts/endtoends/measurement/AndroidTest.xml          | 5 +++++
 .../tests/cts/endtoends/permissions/appoptout/AndroidTest.xml       | 5 +++++
 adservices/tests/cts/endtoends/permissions/noperm/AndroidTest.xml   | 5 +++++
 .../tests/cts/endtoends/permissions/notallowed/AndroidTest.xml      | 5 +++++
 adservices/tests/cts/endtoends/permissions/valid/AndroidTest.xml    | 5 +++++
 adservices/tests/cts/endtoends/topics/AndroidTest.xml               | 5 +++++
 adservices/tests/cts/hosttests/AndroidTest.xml                      | 6 ++++++
 adservices/tests/cts/sandbox/fledge/AndroidTest.xml                 | 5 +++++
 adservices/tests/cts/sandbox/measurement/AndroidTest.xml            | 5 +++++
 adservices/tests/cts/sandbox/topics/AndroidTest.xml                 | 5 +++++
 14 files changed, 73 insertions(+)

diff --git a/adservices/tests/cts/AndroidTest.xml b/adservices/tests/cts/AndroidTest.xml
index b0f9dd96e1..cdddf111f3 100644
--- a/adservices/tests/cts/AndroidTest.xml
+++ b/adservices/tests/cts/AndroidTest.xml
@@ -23,6 +23,12 @@
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsAdServicesDeviceTestCases.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>
+
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="android.adservices.cts" />
         <option name="hidden-api-checks" value="false" />
diff --git a/adservices/tests/cts/AndroidTestDebuggable.xml b/adservices/tests/cts/AndroidTestDebuggable.xml
index 8d69d8f76a..62eea899d4 100644
--- a/adservices/tests/cts/AndroidTestDebuggable.xml
+++ b/adservices/tests/cts/AndroidTestDebuggable.xml
@@ -27,6 +27,12 @@
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsAdServicesDebuggableDeviceTestCases.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>
+
     <test class="com.android.tradefed.testtype.AndroidJUnitTest">
         <option name="package" value="android.adservices.debuggablects" />
         <option name="hidden-api-checks" value="false" />
diff --git a/adservices/tests/cts/adid/AndroidTest.xml b/adservices/tests/cts/adid/AndroidTest.xml
index 6d35457376..e4e0345f2a 100644
--- a/adservices/tests/cts/adid/AndroidTest.xml
+++ b/adservices/tests/cts/adid/AndroidTest.xml
@@ -27,6 +27,11 @@
         <option name="test-file-name" value="CtsAdIdEndToEndTest.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>
+
     <test class="com.android.tradefed.testtype.AndroidJUnitTest">
         <option name="package" value="com.android.adservices.tests.adid"/>
     </test>
diff --git a/adservices/tests/cts/appsetid/AndroidTest.xml b/adservices/tests/cts/appsetid/AndroidTest.xml
index 2a21cd2e75..fdfcfb7fde 100644
--- a/adservices/tests/cts/appsetid/AndroidTest.xml
+++ b/adservices/tests/cts/appsetid/AndroidTest.xml
@@ -27,6 +27,11 @@
         <option name="test-file-name" value="CtsAppSetIdEndToEndTest.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>
+
     <test class="com.android.tradefed.testtype.AndroidJUnitTest">
         <option name="package" value="com.android.adservices.tests.appsetid"/>
     </test>
diff --git a/adservices/tests/cts/endtoends/measurement/AndroidTest.xml b/adservices/tests/cts/endtoends/measurement/AndroidTest.xml
index e7a9239523..8da74fd650 100644
--- a/adservices/tests/cts/endtoends/measurement/AndroidTest.xml
+++ b/adservices/tests/cts/endtoends/measurement/AndroidTest.xml
@@ -28,6 +28,11 @@
         <option name="test-file-name" value="CtsAdServicesEndToEndTestMeasurement.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>
+
     <test class="com.android.tradefed.testtype.AndroidJUnitTest">
         <option name="hidden-api-checks" value="false" /> <!-- Allow hidden API uses -->
         <option name="package" value="com.android.adservices.tests.cts.endtoendtest.measurement"/>
diff --git a/adservices/tests/cts/endtoends/permissions/appoptout/AndroidTest.xml b/adservices/tests/cts/endtoends/permissions/appoptout/AndroidTest.xml
index d4bb18b090..9e0b8876d9 100644
--- a/adservices/tests/cts/endtoends/permissions/appoptout/AndroidTest.xml
+++ b/adservices/tests/cts/endtoends/permissions/appoptout/AndroidTest.xml
@@ -27,6 +27,11 @@
     <option name="test-file-name" value="CtsAdServicesPermissionsAppOptOutEndToEndTests.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>
+
 <test class="com.android.tradefed.testtype.AndroidJUnitTest">
     <option name="package" value="com.android.adservices.tests.permissions.appoptout"/>
 </test>
diff --git a/adservices/tests/cts/endtoends/permissions/noperm/AndroidTest.xml b/adservices/tests/cts/endtoends/permissions/noperm/AndroidTest.xml
index ce5dce1003..1c659026cc 100644
--- a/adservices/tests/cts/endtoends/permissions/noperm/AndroidTest.xml
+++ b/adservices/tests/cts/endtoends/permissions/noperm/AndroidTest.xml
@@ -27,6 +27,11 @@
     <option name="test-file-name" value="CtsAdServicesPermissionsNoPermEndToEndTests.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>
+
 <test class="com.android.tradefed.testtype.AndroidJUnitTest">
     <option name="package" value="com.android.adservices.tests.permissions.noperm"/>
 </test>
diff --git a/adservices/tests/cts/endtoends/permissions/notallowed/AndroidTest.xml b/adservices/tests/cts/endtoends/permissions/notallowed/AndroidTest.xml
index 6b88ba2772..f1cd6effa3 100644
--- a/adservices/tests/cts/endtoends/permissions/notallowed/AndroidTest.xml
+++ b/adservices/tests/cts/endtoends/permissions/notallowed/AndroidTest.xml
@@ -27,6 +27,11 @@
         <option name="test-file-name" value="CtsAdServicesNotInAllowListEndToEndTests.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>
+
     <test class="com.android.tradefed.testtype.AndroidJUnitTest">
         <option name="package" value="com.android.adservices.tests.permissions.notallowed"/>
     </test>
diff --git a/adservices/tests/cts/endtoends/permissions/valid/AndroidTest.xml b/adservices/tests/cts/endtoends/permissions/valid/AndroidTest.xml
index 4c9bb47078..2619fdb2cf 100644
--- a/adservices/tests/cts/endtoends/permissions/valid/AndroidTest.xml
+++ b/adservices/tests/cts/endtoends/permissions/valid/AndroidTest.xml
@@ -27,6 +27,11 @@
     <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>
+
 <test class="com.android.tradefed.testtype.AndroidJUnitTest">
     <option name="package" value="com.android.adservices.tests.permissions.valid"/>
 </test>
diff --git a/adservices/tests/cts/endtoends/topics/AndroidTest.xml b/adservices/tests/cts/endtoends/topics/AndroidTest.xml
index 4e4b358a61..187fd544f8 100644
--- a/adservices/tests/cts/endtoends/topics/AndroidTest.xml
+++ b/adservices/tests/cts/endtoends/topics/AndroidTest.xml
@@ -33,6 +33,11 @@
     <option name="package" value="com.android.adservices.tests.cts.endtoendtest"/>
 </test>
 
+<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>
+
 <!-- Create place to store tests apks that will be installed/uninstalled in the test. -->
 <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
     <option name="run-command" value="mkdir -p /data/local/tmp/cts/install" />
diff --git a/adservices/tests/cts/hosttests/AndroidTest.xml b/adservices/tests/cts/hosttests/AndroidTest.xml
index f9dfed6730..de5b4048d1 100644
--- a/adservices/tests/cts/hosttests/AndroidTest.xml
+++ b/adservices/tests/cts/hosttests/AndroidTest.xml
@@ -25,6 +25,12 @@
         <option name="cleanup-apks" value="true" />
         <option name="test-file-name" value="CtsAdservicesHostTestApp.apk" />
     </target_preparer>
+
+    <target_preparer class="com.android.tradefed.targetprep.DeviceSetup" >
+        <option name="disable-device-config-sync" value="true" />
+        <option name="force-skip-system-props" value="true" />
+    </target_preparer>
+
     <test class="com.android.compatibility.common.tradefed.testtype.JarHostTest" >
         <option name="jar" value="CtsAdServicesHostTests.jar" />
     </test>
diff --git a/adservices/tests/cts/sandbox/fledge/AndroidTest.xml b/adservices/tests/cts/sandbox/fledge/AndroidTest.xml
index 12b4424e9c..5dedecd297 100644
--- a/adservices/tests/cts/sandbox/fledge/AndroidTest.xml
+++ b/adservices/tests/cts/sandbox/fledge/AndroidTest.xml
@@ -31,6 +31,11 @@
         <option name="package" value="com.android.tests.sandbox.fledge"/>
     </test>
 
+    <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>
+
     <object type="module_controller"
             class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController" >
         <option name="mainline-module-package-name" value="com.google.android.adservices" />
diff --git a/adservices/tests/cts/sandbox/measurement/AndroidTest.xml b/adservices/tests/cts/sandbox/measurement/AndroidTest.xml
index 0d0c483d62..d6a48323d6 100644
--- a/adservices/tests/cts/sandbox/measurement/AndroidTest.xml
+++ b/adservices/tests/cts/sandbox/measurement/AndroidTest.xml
@@ -31,6 +31,11 @@
         <option name="package" value="com.android.tests.sandbox.measurement"/>
     </test>
 
+    <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>
+
     <object type="module_controller"
             class="com.android.tradefed.testtype.suite.module.MainlineTestModuleController" >
         <option name="mainline-module-package-name" value="com.google.android.adservices" />
diff --git a/adservices/tests/cts/sandbox/topics/AndroidTest.xml b/adservices/tests/cts/sandbox/topics/AndroidTest.xml
index 240224d585..368e5775a3 100644
--- a/adservices/tests/cts/sandbox/topics/AndroidTest.xml
+++ b/adservices/tests/cts/sandbox/topics/AndroidTest.xml
@@ -26,6 +26,11 @@
         <option name="test-file-name" value="CtsSandboxedTopicsManagerTests.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>
+
     <test class="com.android.tradefed.testtype.AndroidJUnitTest">
         <option name="hidden-api-checks" value="false"/>
         <option name="package" value="com.android.tests.sandbox.topics"/>
-- 
cgit v1.2.3