From cda45a1bdf41d0e781104df38f8fa5c7c8353651 Mon Sep 17 00:00:00 2001
From: Yihan Dong <slotus@google.com>
Date: Wed, 2 Nov 2022 01:01:28 +0000
Subject: [PATCH] Set the device_config_sync baseline back for
 FrameworksCoreTests

Add a TODO in the targetprepare which will finally be removed in the future: b/254155965

Bug: 256314256
Bug: 255972728

Change-Id: I64acac7ce49419818165431ef4eb9d24bb66127b
Test: atest FrameworksCoreTests
---
 core/tests/coretests/AndroidTest.xml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/core/tests/coretests/AndroidTest.xml b/core/tests/coretests/AndroidTest.xml
index 04952bdfa3898..e2cdbf36b5303 100644
--- a/core/tests/coretests/AndroidTest.xml
+++ b/core/tests/coretests/AndroidTest.xml
@@ -25,6 +25,11 @@
         <option name="test-file-name" value="BinderDeathRecipientHelperApp2.apk" />
     </target_preparer>
 
+    <target_preparer class="com.android.tradefed.targetprep.RunCommandTargetPreparer">
+        <!-- TODO(b/254155965): Design a mechanism to finally remove this command. -->
+        <option name="run-command" value="settings put global device_config_sync_disabled 0" />
+    </target_preparer>
+
     <target_preparer class="com.android.compatibility.common.tradefed.targetprep.DeviceInteractionHelperInstaller" />
 
     <option name="test-tag" value="FrameworksCoreTests" />