From 43f5994b18e4254b0a936a16f71130535d2caeef Mon Sep 17 00:00:00 2001 From: Pablo Gamito Date: Fri, 3 Mar 2023 16:50:47 +0000 Subject: [PATCH] Fix replacesLayer assertion to account for splashscreen layer Bug: 271553459 Test: atest FlickerTests Change-Id: Ie399c7333dc7af8c31a144e5e497c7abd96c5d6e --- .../src/com/android/server/wm/flicker/CommonAssertions.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 9dc4bf034e66a..9c3460c124baa 100644 --- a/tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt +++ b/tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt @@ -317,7 +317,8 @@ fun FlickerTest.replacesLayer( assertion.then().isVisible(ComponentNameMatcher.SNAPSHOT, isOptional = true) } if (ignoreSplashscreen) { - assertion.then().isSplashScreenVisibleFor(newLayer, isOptional = true) + assertion.then().isSplashScreenVisibleFor( + ComponentNameMatcher(newLayer.packageName, className = ""), isOptional = true) } assertion.then().isVisible(newLayer)