From 26780b4d6da2e49c556034ee91fc77b1bf2997bd Mon Sep 17 00:00:00 2001
From: Ming-Shin Lu <lumark@google.com>
Date: Fri, 15 Apr 2022 21:25:52 +0800
Subject: [PATCH] Fix imeLayerAndImeSnapshotVisibleOnScreen flaky

In case IME-snapshot removed and the assertion can't verify IME-snapshot
visible from the next frame, fix the assertion by verifying both
IME-snapshot and IME are invisible in the end.

Fix: 228947097
Test: atest FlickerTests:CloseImeEditorPopupDialogTest \
         --rerun-until-failure 20
Change-Id: I1d945cd10761af1c7dad9154a550e69bf4d481ee
---
 .../server/wm/flicker/ime/CloseImeEditorPopupDialogTest.kt       | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeEditorPopupDialogTest.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeEditorPopupDialogTest.kt
index bff099e2e7a19..6257484be9bde 100644
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeEditorPopupDialogTest.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/ime/CloseImeEditorPopupDialogTest.kt
@@ -91,6 +91,7 @@ class CloseImeEditorPopupDialogTest(private val testSpec: FlickerTestParameter)
                     .then()
                     .isVisible(FlickerComponentName.IME_SNAPSHOT)
                     .then()
+                    .isInvisible(FlickerComponentName.IME_SNAPSHOT)
                     .isInvisible(FlickerComponentName.IME)
         }
     }