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

Commit 234cbdd4 authored by Sam Dubey's avatar Sam Dubey Committed by Android (Google) Code Review
Browse files

Revert "Simplify the test step after changing navigation mode" 

This reverts commit a6305420.

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

Change-Id: I14fb56815b3fe914452f522e7fbd4a99ad132020
parent a6305420

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/service/Utils.kt

+5 −0
Original line number Diff line number Diff line
@@ -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(

tests/FlickerTests/src/com/android/server/wm/flicker/service/Utils.kt

+5 −0
Original line number Diff line number Diff line
@@ -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(