| commit | 63d515d10e55fc6b87a7c1192b230d6592e2e3c6 | [log] [tgz] |
|---|---|---|
| author | Nataniel Borges <natanieljr@google.com> | Fri Jan 29 18:18:15 2021 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Fri Jan 29 18:18:15 2021 +0000 |
| tree | cda6784c6c67c9d27a626a069f6b184c867c8c1e | |
| parent | 1c17e60f4cb3b7184ec9cedb95e99c935534e1bf [diff] | |
| parent | 442ffb6671611c90ae153f877c7228a92d978920 [diff] |
Merge "Disable tests flaky on flame" into sc-dev
diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterLegacySplitScreenTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterLegacySplitScreenTest.kt index af99543..224cc19 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterLegacySplitScreenTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterLegacySplitScreenTest.kt
@@ -18,6 +18,7 @@ import android.platform.test.annotations.Presubmit import android.view.Surface +import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.dsl.FlickerBuilder import com.android.server.wm.flicker.dsl.runWithFlicker @@ -162,6 +163,7 @@ } } + @FlakyTest(bugId = 173875043) @Test fun testNonResizeableNotDocked() { val testTag = "testNonResizeableNotDocked"
diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateTwoLaunchedAppTest.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateTwoLaunchedAppTest.kt index 785ccf0..870adb8 100644 --- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateTwoLaunchedAppTest.kt +++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateTwoLaunchedAppTest.kt
@@ -18,6 +18,7 @@ import android.platform.test.annotations.Presubmit import android.view.Surface +import androidx.test.filters.FlakyTest import androidx.test.filters.RequiresDevice import com.android.server.wm.flicker.dsl.FlickerBuilder import com.android.server.wm.flicker.dsl.runWithFlicker @@ -113,6 +114,7 @@ } } + @FlakyTest(bugId = 173875043) @Test fun testRotateAndEnterSplitScreenMode() { val testTag = "testRotateAndEnterSplitScreenMode"