Marked some WM flaky tests as such
Bug: 131005232
Test: self
Change-Id: If024efb1f354d73cbaae1d2f6841062c4fea94af
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/SplitScreenTests.java b/tests/framework/base/windowmanager/src/android/server/wm/SplitScreenTests.java
index d10335c..4531584 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/SplitScreenTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/SplitScreenTests.java
@@ -461,6 +461,7 @@
}
@Test
+ @FlakyTest(bugId = 131005232)
public void testMinimizeAndUnminimizeThenGoingHome() throws Exception {
// Rotate the screen to check that minimize, unminimize, dismiss the docked stack and then
// going home has the correct app transition
@@ -588,6 +589,7 @@
}
@Test
+ @FlakyTest(bugId = 131005232)
public void testActivityLifeCycleOnResizeDockedStack() throws Exception {
launchActivity(TEST_ACTIVITY);
mAmWmState.computeState(TEST_ACTIVITY);
@@ -649,6 +651,7 @@
}
@Test
+ @FlakyTest(bugId = 131005232)
public void testStackListOrderOnSplitScreenDismissed() throws Exception {
launchActivitiesInSplitScreen(
getLaunchActivityBuilder().setTargetActivity(DOCKED_ACTIVITY),
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/StartActivityTests.java b/tests/framework/base/windowmanager/src/android/server/wm/StartActivityTests.java
index 5a0e22c..6923afb 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/StartActivityTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/StartActivityTests.java
@@ -25,6 +25,7 @@
import android.platform.test.annotations.Presubmit;
import androidx.test.rule.ActivityTestRule;
+import androidx.test.filters.FlakyTest;
import org.junit.Rule;
import org.junit.Test;
@@ -90,6 +91,7 @@
* @throws Exception
*/
@Test
+ @FlakyTest(bugId = 131005232)
public void testLegacyStartActivityFromNonActivityContext() throws Exception {
getLaunchActivityBuilder().setTargetActivity(TEST_ACTIVITY)
.setLaunchingActivity(SDK_27_LAUNCHING_ACTIVITY)
diff --git a/tests/framework/base/windowmanager/src/android/server/wm/lifecycle/ActivityLifecycleSplitScreenTests.java b/tests/framework/base/windowmanager/src/android/server/wm/lifecycle/ActivityLifecycleSplitScreenTests.java
index 082d209..8ab383d 100644
--- a/tests/framework/base/windowmanager/src/android/server/wm/lifecycle/ActivityLifecycleSplitScreenTests.java
+++ b/tests/framework/base/windowmanager/src/android/server/wm/lifecycle/ActivityLifecycleSplitScreenTests.java
@@ -46,6 +46,7 @@
import android.content.Intent;
import android.platform.test.annotations.Presubmit;
+import androidx.test.filters.FlakyTest;
import androidx.test.filters.MediumTest;
import org.junit.Before;
@@ -70,6 +71,7 @@
}
@Test
+ @FlakyTest(bugId = 131005232)
public void testResumedWhenRecreatedFromInNonFocusedStack() throws Exception {
// Launch first activity
final Activity firstActivity =
