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

Commit e9fcda5b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes Iea959ffc,I70b1ca53 into main 

* changes:
  Update flaky flicker TaskTransitionTest tests
  Update bugId to current failure
parents 8e9a91aa 5a49e800

tests/FlickerTests/src/com/android/server/wm/flicker/launch/OpenAppFromLockscreenViaIntentTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -200,7 +200,7 @@ open class OpenAppFromLockscreenViaIntentTest(flicker: LegacyFlickerTest) : 
    override fun visibleWindowsShownMoreThanOneConsecutiveEntry() =

        super.visibleWindowsShownMoreThanOneConsecutiveEntry()



    @FlakyTest(bugId = 251217585)

    @FlakyTest(bugId = 285980483)

    @Test

    override fun focusChanges() {

        super.focusChanges()

tests/FlickerTests/src/com/android/server/wm/flicker/launch/TaskTransitionTest.kt

+11 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.app.WallpaperManager 
import android.content.res.Resources

import android.platform.test.annotations.FlakyTest

import android.platform.test.annotations.Presubmit

import android.tools.common.flicker.subject.layers.LayersTraceSubject.Companion.VISIBLE_FOR_MORE_THAN_ONE_ENTRY_IGNORE_LAYERS

import android.tools.common.traces.component.ComponentNameMatcher

import android.tools.common.traces.component.ComponentNameMatcher.Companion.SPLASH_SCREEN

import android.tools.common.traces.component.ComponentNameMatcher.Companion.WALLPAPER_BBQ_WRAPPER
@@ -190,6 +191,16 @@ class TaskTransitionTest(flicker: LegacyFlickerTest) : BaseTest(flicker) { 
        }

    }



    @Presubmit

    @Test

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() {

        flicker.assertLayers {

            this.visibleLayersShownMoreThanOneConsecutiveEntry(

                VISIBLE_FOR_MORE_THAN_ONE_ENTRY_IGNORE_LAYERS + listOf(launchNewTaskApp)

            )

        }

    }



    companion object {

        private fun getWallpaperPackage(instrumentation: Instrumentation): IComponentMatcher {

            val wallpaperManager = WallpaperManager.getInstance(instrumentation.targetContext)