Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d23967c6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 746d12a0 ced4abc8

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

+1 −2
Original line number Original line Diff line number Diff line
@@ -317,8 +317,7 @@ fun FlickerTest.replacesLayer( 
            assertion.then().isVisible(ComponentNameMatcher.SNAPSHOT, isOptional = true)

            assertion.then().isVisible(ComponentNameMatcher.SNAPSHOT, isOptional = true)

        }

        }

        if (ignoreSplashscreen) {

        if (ignoreSplashscreen) {

            assertion.then().isSplashScreenVisibleFor(

            assertion.then().isSplashScreenVisibleFor(newLayer, isOptional = true)

                    ComponentNameMatcher(newLayer.packageName, className = ""), isOptional = true)

        }

        }





        assertion.then().isVisible(newLayer)

        assertion.then().isVisible(newLayer)