From a630542000f42ba11501a3857c6c17d16e9b5678 Mon Sep 17 00:00:00 2001 From: Riddle Hsu Date: Mon, 24 Jul 2023 11:45:46 +0000 Subject: [PATCH] Simplify the test step after changing navigation mode Since the related changes of [1], the display configuration change can take effect with navigation mode change (resource overlay change). It no longer needs to start an additional activity to refresh the display configuration. [1]: Id7b7f4f7a647edd51b4d3255131eb2052f403784 Bug: 275566237 Test: FlickerTests Change-Id: Ib87ac970c5546cb2d999247a216a1b62d89092f8 --- .../src/com/android/wm/shell/flicker/service/Utils.kt | 5 ----- .../src/com/android/server/wm/flicker/service/Utils.kt | 5 ----- 2 files changed, 10 deletions(-) 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 610cedefe5947..a0023c0d969e0 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,9 +22,7 @@ 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 @@ -37,9 +35,6 @@ 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 8242e9a31992c..276f97962d7f2 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,9 +22,7 @@ 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 @@ -37,9 +35,6 @@ object Utils { .around( NavigationModeRule(navigationMode.value, /* changeNavigationModeAfterTest */ false) ) - .around( - LaunchAppRule(MessagingAppHelper(instrumentation), clearCacheAfterParsing = false) - ) .around(RemoveAllTasksButHomeRule()) .around( ChangeDisplayOrientationRule(