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

Commit d0de0cc5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert "Fix replacesLayer assertion to account for splashscreen layer""... 

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

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21786919



Change-Id: Ic1abd702d9904eb6baf8187cf0e2a648fa9330f0
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 3d6b4d18 d23967c6

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

+1 −2
Original line number Diff line number Diff line
@@ -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)