From 2a0277cb5592126b73d8d4f3b94cf1f688319038 Mon Sep 17 00:00:00 2001 From: Ioana Moraru Date: Fri, 17 Sep 2021 17:31:54 +0000 Subject: [PATCH] Revert "Use the display 0 transform for assertions" This reverts commit 02724c041ff5ddbb50241076a4dc01e636c673c9. Reason for revert: Tests using navBarLayerRotatesAndScales and statusBarLayerRotatesScales became flaky Change-Id: I3b3d3b480f22c968077b09449fc97190964c368a --- .../server/wm/flicker/CommonAssertions.kt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt index 2753ae0bcc7fe..16cdfcd1e87ab 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt @@ -89,14 +89,14 @@ fun FlickerTestParameter.statusBarLayerIsVisible() { fun FlickerTestParameter.navBarLayerRotatesAndScales() { assertLayersStart { - val rotation = this.entry.displays.sortedBy { it.id } - .firstOrNull()?.transform?.getRotation() ?: Surface.ROTATION_0 + val rotation = this.entry.displays.firstOrNull()?.transform?.getRotation() + ?: Surface.ROTATION_0 this.visibleRegion(FlickerComponentName.NAV_BAR) .coversExactly(WindowUtils.getNavigationBarPosition(rotation)) } assertLayersEnd { - val rotation = this.entry.displays.sortedBy { it.id } - .firstOrNull()?.transform?.getRotation() ?: Surface.ROTATION_0 + val rotation = this.entry.displays.firstOrNull()?.transform?.getRotation() + ?: Surface.ROTATION_0 this.visibleRegion(FlickerComponentName.NAV_BAR) .coversExactly(WindowUtils.getNavigationBarPosition(rotation)) } @@ -104,14 +104,14 @@ fun FlickerTestParameter.navBarLayerRotatesAndScales() { fun FlickerTestParameter.statusBarLayerRotatesScales() { assertLayersStart { - val rotation = this.entry.displays.sortedBy { it.id } - .firstOrNull()?.transform?.getRotation() ?: Surface.ROTATION_0 + val rotation = this.entry.displays.firstOrNull()?.transform?.getRotation() + ?: Surface.ROTATION_0 this.visibleRegion(FlickerComponentName.STATUS_BAR) .coversExactly(WindowUtils.getStatusBarPosition(rotation)) } assertLayersEnd { - val rotation = this.entry.displays.sortedBy { it.id } - .firstOrNull()?.transform?.getRotation() ?: Surface.ROTATION_0 + val rotation = this.entry.displays.firstOrNull()?.transform?.getRotation() + ?: Surface.ROTATION_0 this.visibleRegion(FlickerComponentName.STATUS_BAR) .coversExactly(WindowUtils.getStatusBarPosition(rotation)) }