summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yihan Dong <slotus@google.com> 2022-11-08 14:57:13 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-08 14:57:13 +0000
commitf6b52cf9f3acab1a2ed04f9332767c7874c479c2 (patch)
treec48cfaf7f890eccf9349c87837b7c99f1af31e8d
parent53e2c9f966b622f0691741cc5a35bf5e4ed57583 (diff)
parent5594a6ac6d774ddd9006b5e6ae66b4248504ee7d (diff)
Merge "Set the device_config_sync baseline back for FrameworksCoreTests" am: 4d07687915 am: 5786473a37 am: 5594a6ac6d
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2280531 Change-Id: Ibe8380763a3fcc2c366cd560d843d56ef9f69ec7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--core/tests/coretests/AndroidTest.xml5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/tests/coretests/AndroidTest.xml b/core/tests/coretests/AndroidTest.xml
index 04952bdfa389..e2cdbf36b530 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" />