Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I3439a096,I2421e2d3 into main

Browse Source 
* changes:
  Add missing @Test annotations
  Remove accidentely kept @Presubmit annotation
This commit is contained in:
Treehugger Robot
2023-07-26 12:03:48 +00:00
committed by Android (Google) Code Review
parent 0bd5f07801 ff2c76b310
commit 7ade22ae08
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/WindowManager/Shell/tests/flicker/src/com/android/wm/shell/flicker/pip/MovePipDownOnShelfHeightChange.kt
View File

@@ -17,7 +17,6 @@
package com.android.wm.shell.flicker.pip
import android.platform.test.annotations.FlakyTest
import android.platform.test.annotations.Presubmit
import android.tools.device.flicker.junit.FlickerParametersRunnerFactory
import android.tools.device.flicker.legacy.FlickerBuilder
import android.tools.device.flicker.legacy.LegacyFlickerTest
@@ -68,7 +67,6 @@ class MovePipDownOnShelfHeightChange(flicker: LegacyFlickerTest) :
/** Checks that the visible region of [pipApp] layer always moves down during the animation. */
@FlakyTest(bugId = 292813143)
@Presubmit
@Test
fun pipLayerMovesDown() = pipLayerMoves(Direction.DOWN)
}

2
tests/FlickerTests/src/com/android/server/wm/flicker/activityembedding/layoutchange/HorizontalSplitChangeRatioTest.kt
View File

@@ -67,9 +67,11 @@ class HorizontalSplitChangeRatioTest(flicker: LegacyFlickerTest) :
}
@FlakyTest(bugId = 293075402)
@Test
override fun backgroundLayerNeverVisible() = super.backgroundLayerNeverVisible()
@FlakyTest(bugId = 293075402)
@Test
override fun visibleLayersShownMoreThanOneConsecutiveEntry() =
super.visibleLayersShownMoreThanOneConsecutiveEntry()