From 234cbdd4eeed2dda0bceb3441cd979c078c634bf Mon Sep 17 00:00:00 2001
From: Sam Dubey <dubeyshubham@google.com>
Date: Wed, 26 Jul 2023 15:05:00 +0000
Subject: [PATCH] Revert "Simplify the test step after changing navigation
 mode"

This reverts commit a630542000f42ba11501a3857c6c17d16e9b5678.

Reason for revert: Testing to see if this caused platinum flake b/293286278

Change-Id: I14fb56815b3fe914452f522e7fbd4a99ad132020
---
 .../src/com/android/wm/shell/flicker/service/Utils.kt        | 5 +++++
 .../src/com/android/server/wm/flicker/service/Utils.kt       | 5 +++++
 2 files changed, 10 insertions(+)

diff --git a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/Utils.kt b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/Utils.kt
index a0023c0d969e0..610cedefe5947 100644
--- a/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/Utils.kt
+++ b/libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/Utils.kt
@@ -22,7 +22,9 @@ import android.platform.test.rule.PressHomeRule
 import android.platform.test.rule.UnlockScreenRule
 import android.tools.common.NavBar
 import android.tools.common.Rotation
+import android.tools.device.apphelpers.MessagingAppHelper
 import android.tools.device.flicker.rules.ChangeDisplayOrientationRule
+import android.tools.device.flicker.rules.LaunchAppRule
 import android.tools.device.flicker.rules.RemoveAllTasksButHomeRule
 import androidx.test.platform.app.InstrumentationRegistry
 import org.junit.rules.RuleChain
@@ -35,6 +37,9 @@ object Utils {
             .around(
                 NavigationModeRule(navigationMode.value, /* changeNavigationModeAfterTest */ false)
             )
+            .around(
+                LaunchAppRule(MessagingAppHelper(instrumentation), clearCacheAfterParsing = false)
+            )
             .around(RemoveAllTasksButHomeRule())
             .around(
                 ChangeDisplayOrientationRule(
diff --git a/tests/FlickerTests/src/com/android/server/wm/flicker/service/Utils.kt b/tests/FlickerTests/src/com/android/server/wm/flicker/service/Utils.kt
index 276f97962d7f2..8242e9a31992c 100644
--- a/tests/FlickerTests/src/com/android/server/wm/flicker/service/Utils.kt
+++ b/tests/FlickerTests/src/com/android/server/wm/flicker/service/Utils.kt
@@ -22,7 +22,9 @@ import android.platform.test.rule.PressHomeRule
 import android.platform.test.rule.UnlockScreenRule
 import android.tools.common.NavBar
 import android.tools.common.Rotation
+import android.tools.device.apphelpers.MessagingAppHelper
 import android.tools.device.flicker.rules.ChangeDisplayOrientationRule
+import android.tools.device.flicker.rules.LaunchAppRule
 import android.tools.device.flicker.rules.RemoveAllTasksButHomeRule
 import androidx.test.platform.app.InstrumentationRegistry
 import org.junit.rules.RuleChain
@@ -35,6 +37,9 @@ object Utils {
             .around(
                 NavigationModeRule(navigationMode.value, /* changeNavigationModeAfterTest */ false)
             )
+            .around(
+                LaunchAppRule(MessagingAppHelper(instrumentation), clearCacheAfterParsing = false)
+            )
             .around(RemoveAllTasksButHomeRule())
             .around(
                 ChangeDisplayOrientationRule(