Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Use the display 0 transform for assertions"

Browse Source 
This reverts commit 02724c041f.

Reason for revert: Tests using navBarLayerRotatesAndScales and statusBarLayerRotatesScales became flaky

Change-Id: I3b3d3b480f22c968077b09449fc97190964c368a
This commit is contained in:
Ioana Moraru
2021-09-17 17:31:54 +00:00
parent 02724c041f
commit 2a0277cb55
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt
View File

@@ -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))
}