summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Yihan Dong <slotus@google.com> 2022-11-08 13:43:24 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-08 13:43:24 +0000
commit5786473a374b4f9ab1c35319c94127913ff3f81f (patch)
treeae79b965116b0825108146bb3120569eca26f32c
parent946f42e249ffd02f0a56423dd59a90aad9773596 (diff)
parent4d07687915b39dd4c241f5d22e1f0bd02e41bff8 (diff)
Merge "Set the device_config_sync baseline back for FrameworksCoreTests" am: 4d07687915
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2280531 Change-Id: I2ce685d36142ddf3263b1f37e2bc2b0e2b770228 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" />