Merge "Disable tests flaky on flame" into sc-dev am: 63d515d10e

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I43c5b1fd254357138ce5bff77a4da060495cbf70
This commit is contained in:
Nataniel Borges
2021-01-29 18:30:28 +00:00
committed by Automerger Merge Worker
2 changed files with 4 additions and 0 deletions

View File

@@ -18,6 +18,7 @@ package com.android.wm.shell.flicker.legacysplitscreen
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 @@ class EnterLegacySplitScreenTest(
}
}
@FlakyTest(bugId = 173875043)
@Test
fun testNonResizeableNotDocked() {
val testTag = "testNonResizeableNotDocked"

View File

@@ -18,6 +18,7 @@ package com.android.wm.shell.flicker.legacysplitscreen
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 @@ class RotateTwoLaunchedAppTest(
}
}
@FlakyTest(bugId = 173875043)
@Test
fun testRotateAndEnterSplitScreenMode() {
val testTag = "testRotateAndEnterSplitScreenMode"