From 20fff44e86775c250e4a194c224af1abdc97dd32 Mon Sep 17 00:00:00 2001
From: hanlixy <hanlixy@google.com>
Date: Tue, 7 Mar 2023 18:11:09 +0000
Subject: 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
---
 adservices/tests/cts/endtoends/permissions/appoptout/AndroidTest.xml  | 4 ----
 adservices/tests/cts/endtoends/permissions/noperm/AndroidTest.xml     | 4 ----
 adservices/tests/cts/endtoends/permissions/notallowed/AndroidTest.xml | 4 ----
 adservices/tests/cts/endtoends/permissions/valid/AndroidTest.xml      | 4 ----
 4 files changed, 16 deletions(-)

(limited to 'adservices/tests/cts/endtoends/permissions')

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" />
-- 
cgit v1.2.3