Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 801af429 authored Apr 20, 2022 by Nataniel Borges Committed by Automerger Merge Worker Apr 20, 2022

Merge "Disable failing visible consecutive layers assertion" into tm-dev am: eca6ae39

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

Change-Id: If430b1957f779639a0bb77009279fb8bdd515c11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 09258728 eca6ae39

tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppBackButtonTest.kt

+6 −0

Original line number	Diff line number	Diff line
		@@ -98,6 +98,12 @@ class CloseAppBackButtonTest(testSpec: FlickerTestParameter) : CloseAppTransitio
		super.statusBarLayerRotatesScales()
		}

		/** {@inheritDoc} */
		@FlakyTest(bugId = 229762973)
		@Test
		override fun visibleLayersShownMoreThanOneConsecutiveEntry() =
		super.visibleLayersShownMoreThanOneConsecutiveEntry()

		companion object {
		/**
		* Creates the test configurations.

tests/FlickerTests/src/com/android/server/wm/flicker/close/CloseAppHomeButtonTest.kt

+2 −3

Original line number	Diff line number	Diff line
		@@ -101,11 +101,10 @@ class CloseAppHomeButtonTest(testSpec: FlickerTestParameter) : CloseAppTransitio
		}

		/** {@inheritDoc} */
		@Presubmit
		@FlakyTest(bugId = 229762973)
		@Test
		override fun visibleLayersShownMoreThanOneConsecutiveEntry() {
		override fun visibleLayersShownMoreThanOneConsecutiveEntry() =
		super.visibleLayersShownMoreThanOneConsecutiveEntry()
		}

		companion object {
		/**