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

Commit b2a2a0a1 authored by Nataniel Borges's avatar Nataniel Borges Committed by Automerger Merge Worker
Browse files

Merge "Disable tests flaky on flame" into sc-dev am: 63d515d1 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13430929

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I43c5b1fd254357138ce5bff77a4da060495cbf70
parents b2e166d3 63d515d1

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/EnterLegacySplitScreenTest.kt

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.wm.shell.flicker.legacysplitscreen 


import android.platform.test.annotations.Presubmit

import android.view.Surface

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

import com.android.server.wm.flicker.dsl.FlickerBuilder

import com.android.server.wm.flicker.dsl.runWithFlicker
@@ -162,6 +163,7 @@ class EnterLegacySplitScreenTest( 
        }

    }



    @FlakyTest(bugId = 173875043)

    @Test

    fun testNonResizeableNotDocked() {

        val testTag = "testNonResizeableNotDocked"

libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/legacysplitscreen/RotateTwoLaunchedAppTest.kt

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.wm.shell.flicker.legacysplitscreen 


import android.platform.test.annotations.Presubmit

import android.view.Surface

import androidx.test.filters.FlakyTest

import androidx.test.filters.RequiresDevice

import com.android.server.wm.flicker.dsl.FlickerBuilder

import com.android.server.wm.flicker.dsl.runWithFlicker
@@ -113,6 +114,7 @@ class RotateTwoLaunchedAppTest( 
        }

    }



    @FlakyTest(bugId = 173875043)

    @Test

    fun testRotateAndEnterSplitScreenMode() {

        val testTag = "testRotateAndEnterSplitScreenMode"