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

Commit 88fa663e authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix group 2 config for local testing" into main

parents 9de03386 46315923

libs/WindowManager/Shell/tests/flicker/splitscreen/Android.bp

+2 −0
Original line number Original line Diff line number Diff line
@@ -65,9 +65,11 @@ android_test { 




android_test {

android_test {

    name: "WMShellFlickerTestsSplitScreenGroup2",

    name: "WMShellFlickerTestsSplitScreenGroup2",

    defaults: ["WMShellFlickerTestsDefault"],

    manifest: "AndroidManifest.xml",

    manifest: "AndroidManifest.xml",

    package_name: "com.android.wm.shell.flicker.splitscreen",

    package_name: "com.android.wm.shell.flicker.splitscreen",

    instrumentation_target_package: "com.android.wm.shell.flicker.splitscreen",

    instrumentation_target_package: "com.android.wm.shell.flicker.splitscreen",

    test_config_template: "AndroidTestTemplate.xml",

    srcs: [

    srcs: [

        ":WMShellFlickerTestsSplitScreenBase-src",

        ":WMShellFlickerTestsSplitScreenBase-src",

        ":WMShellFlickerTestsSplitScreenGroup2-src",

        ":WMShellFlickerTestsSplitScreenGroup2-src",

libs/WindowManager/Shell/tests/flicker/splitscreen/src/com/android/wm/shell/flicker/splitscreen/UnlockKeyguardToSplitScreen.kt

+1 −2
Original line number Original line Diff line number Diff line
@@ -47,7 +47,7 @@ import org.junit.runners.Parameterized 
 * To run this test: `atest WMShellFlickerTestsSplitScreen:UnlockKeyguardToSplitScreen`

 * To run this test: `atest WMShellFlickerTestsSplitScreen:UnlockKeyguardToSplitScreen`

 */

 */

@RequiresDevice

@RequiresDevice

@Postsubmit

@FlakyTest(bugId = 293578017)

@RunWith(Parameterized::class)

@RunWith(Parameterized::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@Parameterized.UseParametersRunnerFactory(FlickerParametersRunnerFactory::class)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)

@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@@ -61,7 +61,6 @@ class UnlockKeyguardToSplitScreen(override val flicker: LegacyFlickerTest) : 
        }

        }





    @Test

    @Test

    @FlakyTest(bugId = 293578017)

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

    override fun visibleLayersShownMoreThanOneConsecutiveEntry() =

        super.visibleLayersShownMoreThanOneConsecutiveEntry()

        super.visibleLayersShownMoreThanOneConsecutiveEntry()