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

Commit e89f1336 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: Icdfc8c52af1d9b06aa99113de5006eda50791ac7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 9dbfcb7e eca6ae39

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

+6 −0

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

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

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

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

+2 −3

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

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

	companion object {		companion object {
	/**		/**