summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRachit Jain <jainrachit@google.com>2023-08-24 18:55:45 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2023-08-24 18:55:45 +0000
commit3c1bb397f8b6d2338ed8bcd7ef3e905f02cd80ff (patch)
tree0e193cb60117bd60be381f64bbb0a0ce346abafa
parent759fdc72b8d4e3b3fb083ab7db309a894f31b514 (diff)
parentfc11dadf40d83f2758230338229f2b98e7e806f1 (diff)
downloadservices-3c1bb397f8b6d2338ed8bcd7ef3e905f02cd80ff.tar.gz
Merge "ActivityOptionsWrapperTest.create_returnsActivityOptionWrapper test failing" into main
-rw-r--r--builtInServices/tests/src/com/android/server/wm/ActivityOptionsWrapperTest.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/builtInServices/tests/src/com/android/server/wm/ActivityOptionsWrapperTest.java b/builtInServices/tests/src/com/android/server/wm/ActivityOptionsWrapperTest.java
index 682c31f..01bb696 100644
--- a/builtInServices/tests/src/com/android/server/wm/ActivityOptionsWrapperTest.java
+++ b/builtInServices/tests/src/com/android/server/wm/ActivityOptionsWrapperTest.java
@@ -20,6 +20,8 @@ import static com.google.common.truth.Truth.assertThat;
import android.app.ActivityOptions;
+import androidx.test.filters.FlakyTest;
+
import org.junit.Test;
/**
@@ -27,6 +29,7 @@ import org.junit.Test;
*/
public final class ActivityOptionsWrapperTest {
@Test
+ @FlakyTest(bugId = 284947065)
public void create_returnsActivityOptionWrapper() {
ActivityOptions options = ActivityOptions.makeBasic();
ActivityOptionsWrapper wrapper = ActivityOptionsWrapper.create(options);