Remove Legacy Flag for Disabling Flag Syncing

We used to set this flag along with "disable-device-config-sync" to disable flag syncing. However, we migrated to use "device_config set_sync_disabled_for_tests persistent" afterwards. "force-skip-system-props" was dropped when removing "disable-device-config-sync".

Bug: 249287767
Test: atest
Change-Id: Ibbdec37207a1147ae6bc0e53517d6d4debf6f145

10 files changed, 0 insertions, 40 deletions

diff --git a/adservices/tests/cts/endtoends/measurement/AndroidTest.xml b/adservices/tests/cts/endtoends/measurement/AndroidTest.xml
index 8e3432e599..ea389c811e 100644
--- a/adservices/tests/cts/endtoends/measurement/AndroidTest.xml
+++ b/adservices/tests/cts/endtoends/measurement/AndroidTest.xml
@@ -28,10 +28,6 @@
         <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" />
-    </target_preparer>
-
     <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
         <!-- Disable global_kill_switch to ignore the effect of actual PH values. -->
         <option name="run-command" value="device_config put adservices global_kill_switch false" />
diff --git a/adservices/tests/cts/endtoends/permissions/appoptout/AndroidTest.xml b/adservices/tests/cts/endtoends/permissions/appoptout/AndroidTest.xml
index ef63d4fd5e..98349f0457 100644
--- a/adservices/tests/cts/endtoends/permissions/appoptout/AndroidTest.xml
+++ b/adservices/tests/cts/endtoends/permissions/appoptout/AndroidTest.xml
@@ -27,10 +27,6 @@
         <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" />
-    </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" />
diff --git a/adservices/tests/cts/endtoends/permissions/noperm/AndroidTest.xml b/adservices/tests/cts/endtoends/permissions/noperm/AndroidTest.xml
index daece89da7..b188284bb5 100644
--- a/adservices/tests/cts/endtoends/permissions/noperm/AndroidTest.xml
+++ b/adservices/tests/cts/endtoends/permissions/noperm/AndroidTest.xml
@@ -27,10 +27,6 @@
         <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" />
-    </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" />
diff --git a/adservices/tests/cts/endtoends/permissions/notallowed/AndroidTest.xml b/adservices/tests/cts/endtoends/permissions/notallowed/AndroidTest.xml
index ef8c6f9cb3..7a94567760 100644
--- a/adservices/tests/cts/endtoends/permissions/notallowed/AndroidTest.xml
+++ b/adservices/tests/cts/endtoends/permissions/notallowed/AndroidTest.xml
@@ -45,10 +45,6 @@
         <option name="teardown-command" value="device_config set_sync_disabled_for_tests none" />
     </target_preparer>
 
-    <target_preparer class="com.android.tradefed.targetprep.DeviceSetup" >
-        <option name="force-skip-system-props" 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 385200f96f..d9f320d66d 100644
--- a/adservices/tests/cts/endtoends/permissions/valid/AndroidTest.xml
+++ b/adservices/tests/cts/endtoends/permissions/valid/AndroidTest.xml
@@ -27,10 +27,6 @@
         <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" />
-    </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" />
diff --git a/adservices/tests/cts/endtoends/topics/CtsAdExtServicesEndToEndTests.xml b/adservices/tests/cts/endtoends/topics/CtsAdExtServicesEndToEndTests.xml
index 7d15fb8614..765238d6a0 100644
--- a/adservices/tests/cts/endtoends/topics/CtsAdExtServicesEndToEndTests.xml
+++ b/adservices/tests/cts/endtoends/topics/CtsAdExtServicesEndToEndTests.xml
@@ -32,10 +32,6 @@
         <option name="package" value="com.android.adextservices.tests.cts.endtoendtest"/>
     </test>
 
-    <target_preparer class="com.android.tradefed.targetprep.DeviceSetup" >
-        <option name="force-skip-system-props" value="true" />
-    </target_preparer>
-
     <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
         <!-- Disable global/topics kill_switch to ignore the effect of actual PH values. -->
         <option name="run-command" value="device_config put adservices global_kill_switch false" />
diff --git a/adservices/tests/cts/endtoends/topics/CtsAdServicesEndToEndTests.xml b/adservices/tests/cts/endtoends/topics/CtsAdServicesEndToEndTests.xml
index 6b77f47f16..e44eba6ba4 100644
--- a/adservices/tests/cts/endtoends/topics/CtsAdServicesEndToEndTests.xml
+++ b/adservices/tests/cts/endtoends/topics/CtsAdServicesEndToEndTests.xml
@@ -34,10 +34,6 @@
         <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" />
-    </target_preparer>
-
     <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
         <!-- Disable global/topics kill_switch to ignore the effect of actual PH values. -->
         <option name="run-command" value="device_config put adservices global_kill_switch false" />
diff --git a/adservices/tests/cts/endtoends/topics/appupdate/AndroidTest.xml b/adservices/tests/cts/endtoends/topics/appupdate/AndroidTest.xml
index b3b24c60f8..495652b9c3 100644
--- a/adservices/tests/cts/endtoends/topics/appupdate/AndroidTest.xml
+++ b/adservices/tests/cts/endtoends/topics/appupdate/AndroidTest.xml
@@ -33,10 +33,6 @@
         <option name="package" value="com.android.adservices.tests.cts.topics.appupdate"/>
     </test>
 
-    <target_preparer class="com.android.tradefed.targetprep.DeviceSetup" >
-        <option name="force-skip-system-props" value="true" />
-    </target_preparer>
-
     <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
         <!-- Disable global/topics kill_switch to ignore the effect of actual PH values. -->
         <option name="run-command" value="device_config put adservices global_kill_switch false" />
diff --git a/adservices/tests/cts/endtoends/topics/connection/AndroidTest.xml b/adservices/tests/cts/endtoends/topics/connection/AndroidTest.xml
index 7355baf0d7..bacbf81163 100644
--- a/adservices/tests/cts/endtoends/topics/connection/AndroidTest.xml
+++ b/adservices/tests/cts/endtoends/topics/connection/AndroidTest.xml
@@ -53,10 +53,6 @@
         <option name="teardown-command" value="device_config set_sync_disabled_for_tests none" />
     </target_preparer>
 
-    <target_preparer class="com.android.tradefed.targetprep.DeviceSetup" >
-        <option name="force-skip-system-props" 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/endtoends/topics/mdd/AndroidTest.xml b/adservices/tests/cts/endtoends/topics/mdd/AndroidTest.xml
index ab1a876ca8..0831b946bb 100644
--- a/adservices/tests/cts/endtoends/topics/mdd/AndroidTest.xml
+++ b/adservices/tests/cts/endtoends/topics/mdd/AndroidTest.xml
@@ -32,10 +32,6 @@
         <option name="package" value="com.android.adservices.tests.cts.topics.mdd"/>
     </test>
 
-    <target_preparer class="com.android.tradefed.targetprep.DeviceSetup" >
-        <option name="force-skip-system-props" value="true" />
-    </target_preparer>
-
     <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
         <!-- Disable global/topics kill_switch to ignore the effect of actual PH values. -->
         <option name="run-command" value="device_config put adservices global_kill_switch false" />