summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2023-12-08 20:37:58 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2023-12-08 20:37:58 +0000
commit773dbfea128807be7cc1b9e613f95f3bb9bd6395 (patch)
treeb75381e70e99ddfd7e4f73df26eb349a4a69451a
parent785b7ec637dd9a63dfe49e3cd04d8a5d04f5ed7e (diff)
parentb443ca5fa1bdf2dd8adcee2bdf2bf1f41bdc96a2 (diff)
Merge "Merge "Mark test as flaky to unblock presubmits." into main am: e701119e46 am: 249f348c59 am: 737d9496e1" into main
-rw-r--r--core/tests/coretests/src/android/provider/DeviceConfigTest.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/tests/coretests/src/android/provider/DeviceConfigTest.java b/core/tests/coretests/src/android/provider/DeviceConfigTest.java
index 7c4136d62b8f..9300d1e5cb95 100644
--- a/core/tests/coretests/src/android/provider/DeviceConfigTest.java
+++ b/core/tests/coretests/src/android/provider/DeviceConfigTest.java
@@ -831,6 +831,7 @@ public class DeviceConfigTest {
}
@Test
+ @FlakyTest(bugId = 299483542)
public void onPropertiesChangedListener_setPropertiesCallback() {
DeviceConfig.setProperty(NAMESPACE, KEY, VALUE, false);
DeviceConfig.setProperty(NAMESPACE, KEY2, VALUE2, false);