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

Commit 32b39b84 authored by Daniel Akinola's avatar Daniel Akinola
Browse files

Removing ScreenRecordRule from MediaProjection desktop mode tests 

These tests have had major performance regressions - possible cause is the addition of these screen record rule. These tests already attempt to set up a virtual display and record a screen, so attempting to record over that might be causing some unexpected behaviours which is causing regressions.

Bug: 407784029
Test: changed tests
Flag: EXEMPT refactor
Change-Id: I90efdfd85ee7eca562ab462f0b891327c5825eaf
parent 36c330df

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/StartAppMediaProjectionResizeAndDrag.kt

+1 −3
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.wm.shell.scenarios 


import android.app.Instrumentation

import android.platform.test.annotations.Postsubmit

import android.platform.test.rule.ScreenRecordRule

import android.tools.NavBar

import android.tools.Rotation

import android.tools.device.apphelpers.CalculatorAppHelper
@@ -41,8 +40,7 @@ import org.junit.runners.BlockJUnit4ClassRunner 


@RunWith(BlockJUnit4ClassRunner::class)

@Postsubmit

@ScreenRecordRule.ScreenRecord

open class StartAppMediaProjectionResizeAndDrag : TestScenarioBase() {

open class StartAppMediaProjectionResizeAndDrag {

    private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

    private val tapl = LauncherInstrumentation()

    private val wmHelper = WindowManagerStateHelper(instrumentation)

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/StartAppMediaProjectionWithMaxDesktopWindows.kt

+1 −3
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.wm.shell.scenarios 


import android.app.Instrumentation

import android.platform.test.annotations.Postsubmit

import android.platform.test.rule.ScreenRecordRule

import android.tools.NavBar

import android.tools.Rotation

import android.tools.device.apphelpers.CalculatorAppHelper
@@ -44,8 +43,7 @@ import org.junit.runners.BlockJUnit4ClassRunner 


@RunWith(BlockJUnit4ClassRunner::class)

@Postsubmit

@ScreenRecordRule.ScreenRecord

open class StartAppMediaProjectionWithMaxDesktopWindows : TestScenarioBase() {

open class StartAppMediaProjectionWithMaxDesktopWindows {



    val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

    val tapl = LauncherInstrumentation()

libs/WindowManager/Shell/tests/e2e/desktopmode/scenarios/src/com/android/wm/shell/scenarios/StartScreenMediaProjectionWithMaxDesktopWindows.kt

+1 −3
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.wm.shell.scenarios 


import android.app.Instrumentation

import android.platform.test.annotations.Postsubmit

import android.platform.test.rule.ScreenRecordRule

import android.tools.NavBar

import android.tools.Rotation

import android.tools.traces.parsers.WindowManagerStateHelper
@@ -43,8 +42,7 @@ import org.junit.runners.BlockJUnit4ClassRunner 


@RunWith(BlockJUnit4ClassRunner::class)

@Postsubmit

@ScreenRecordRule.ScreenRecord

open class StartScreenMediaProjectionWithMaxDesktopWindows : TestScenarioBase() {

open class StartScreenMediaProjectionWithMaxDesktopWindows {

    private val instrumentation: Instrumentation = InstrumentationRegistry.getInstrumentation()

    private val tapl = LauncherInstrumentation()

    private val wmHelper = WindowManagerStateHelper(instrumentation)