Merge "Revert "Fix replacesLayer assertion to account for splashscreen layer"" into udc-dev

2023-03-30 12:00:22 +00:00
parent 746d12a07b ced4abc82f
commit d23967c6ea
1 changed files with 1 additions and 2 deletions
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/CommonAssertions.kt
@@ -317,8 +317,7 @@ fun FlickerTest.replacesLayer(
            assertion.then().isVisible(ComponentNameMatcher.SNAPSHOT, isOptional = true)
        }
        if (ignoreSplashscreen) {
-            assertion.then().isSplashScreenVisibleFor(
-                    ComponentNameMatcher(newLayer.packageName, className = ""), isOptional = true)
+            assertion.then().isSplashScreenVisibleFor(newLayer, isOptional = true)
        }

        assertion.then().isVisible(newLayer)