diff options
| author | 2020-08-18 07:46:51 +0000 | |
|---|---|---|
| committer | 2020-08-18 07:46:51 +0000 | |
| commit | 24ba5831ccbf9a116a2407a0f6bbaa7f188e100f (patch) | |
| tree | 192260623c773524365e3832379d6c535837fd0c | |
| parent | f8d2cb59ae79e66feaea8948252b5a347e863ddb (diff) | |
| parent | 17a0705b5e33473aa94371ce41bc675ec806800d (diff) | |
Merge "Disable flaky 'navBarLayerIsVisible' assertions"
| -rw-r--r-- | tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt | 2 | ||||
| -rw-r--r-- | tests/FlickerTests/src/com/android/server/wm/flicker/splitscreen/OpenAppToSplitScreenTest.kt | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt index 9a8e37b19e56..57d6127b1cd1 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt @@ -88,7 +88,7 @@ class OpenAppWarmTest( noUncoveredRegions(Surface.ROTATION_0, rotation, bugId = 141361128) navBarLayerRotatesAndScales(Surface.ROTATION_0, rotation) statusBarLayerRotatesScales(Surface.ROTATION_0, rotation) - navBarLayerIsAlwaysVisible() + navBarLayerIsAlwaysVisible(bugId = 140855415) statusBarLayerIsAlwaysVisible(enabled = false) wallpaperLayerBecomesInvisible() } diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/splitscreen/OpenAppToSplitScreenTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/splitscreen/OpenAppToSplitScreenTest.kt index 91ec211805f7..279092d716e2 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/splitscreen/OpenAppToSplitScreenTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/splitscreen/OpenAppToSplitScreenTest.kt @@ -87,9 +87,9 @@ class OpenAppToSplitScreenTest( } layersTrace { - navBarLayerIsAlwaysVisible() + navBarLayerIsAlwaysVisible(bugId = 140855415) statusBarLayerIsAlwaysVisible() - noUncoveredRegions(rotation) + noUncoveredRegions(rotation, enabled = false) navBarLayerRotatesAndScales(rotation, bugId = 140855415) statusBarLayerRotatesScales(rotation) |