commit e701119e469b889410212cbbdbd110d6ae4ed5ef
author Ted Bauer <tedbauer@google.com> Fri Dec 08 19:35:47 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Dec 08 19:35:47 2023 +0000
tree 8d1524e1a6a782fce7ee2b6944aba8aaddc5715f
parent 2f005a180631fe66e5ec321638a05f4887a967b2
parent 57791e51edd7ae13c08c6e6c43a62f5881085dca

Merge "Mark test as flaky to unblock presubmits." into main

core/tests/coretests/src/android/provider/DeviceConfigTest.java

diff --git a/core/tests/coretests/src/android/provider/DeviceConfigTest.java b/core/tests/coretests/src/android/provider/DeviceConfigTest.java
index 1ea20f1..de8ff3f 100644
--- a/core/tests/coretests/src/android/provider/DeviceConfigTest.java
+++ b/core/tests/coretests/src/android/provider/DeviceConfigTest.java
@@ -28,6 +28,7 @@
 import android.platform.test.annotations.Presubmit;
 
 import androidx.test.InstrumentationRegistry;
+import androidx.test.filters.FlakyTest;
 import androidx.test.filters.SmallTest;
 import androidx.test.runner.AndroidJUnit4;
 
@@ -742,6 +743,7 @@
     }
 
     @Test
+    @FlakyTest(bugId = 299483542)
     public void onPropertiesChangedListener_setPropertiesCallback() {
         DeviceConfig.setProperty(NAMESPACE, KEY, VALUE, false);
         DeviceConfig.setProperty(NAMESPACE, KEY2, VALUE2, false);