Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 249f348c authored by Ted Bauer's avatar Ted Bauer Committed by Automerger Merge Worker
Browse files

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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2794895



Change-Id: I05a5865b2ee13be65e16a8a0bcdc58fc33e4d461
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0afab341 e701119e

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

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.os.Bundle; 
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 @@ public class DeviceConfigTest { 
    }



    @Test

    @FlakyTest(bugId = 299483542)

    public void onPropertiesChangedListener_setPropertiesCallback() {

        DeviceConfig.setProperty(NAMESPACE, KEY, VALUE, false);

        DeviceConfig.setProperty(NAMESPACE, KEY2, VALUE2, false);