From fd8178a1346e9b969b68cd7cf8b5c1c27154020a Mon Sep 17 00:00:00 2001 From: Nataniel Borges Date: Thu, 3 Sep 2020 13:23:26 +0200 Subject: [PATCH] Fix test execution on hwasan builds THe navbar becomes invisible during the rotation, and becomes visible again once the rotation animation finishes. This CL fixes the wm flicker tests after migrating they were migrated to hwasan-userdebug builds. Bug: 161858082 Test: atest FlickerTests Change-Id: I5c7fcff58a09fda2e7f1e2c10f05b48f055c3685 --- .../src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt | 2 +- .../src/com/android/server/wm/flicker/launch/OpenAppWarmTest.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt index 254209aee4501..17590723da8de 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppColdTest.kt @@ -80,7 +80,7 @@ class OpenAppColdTest( noUncoveredRegions(Surface.ROTATION_0, rotation, bugId = 141361128) navBarLayerRotatesAndScales(Surface.ROTATION_0, rotation) statusBarLayerRotatesScales(Surface.ROTATION_0, rotation) - navBarLayerIsAlwaysVisible() + navBarLayerIsAlwaysVisible(enabled = rotation == Surface.ROTATION_0) statusBarLayerIsAlwaysVisible(enabled = false) wallpaperLayerBecomesInvisible() } 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 dda41a3021a05..afadb58eeed51 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(bugId = 140855415) + navBarLayerIsAlwaysVisible(enabled = rotation == Surface.ROTATION_0) statusBarLayerIsAlwaysVisible(enabled = false) wallpaperLayerBecomesInvisible() }