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

Commit 482c5dc5 authored by Alexander Hartl's avatar Alexander Hartl Committed by Android (Google) Code Review
Browse files

Merge "PowerAndPerfomance: annotate tests for Perceptible Tasks" into main

parents d549cc31 df0bdfd0

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/desktopmode/DesktopTaskChangeListenerTest.kt

+10 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.app.ActivityManager.RunningTaskInfo 
import android.app.WindowConfiguration.WINDOWING_MODE_FREEFORM

import android.content.Intent

import android.graphics.Rect

import android.platform.test.annotations.DesktopTest

import android.platform.test.annotations.DisableFlags

import android.platform.test.annotations.EnableFlags

import android.testing.AndroidTestingRunner
@@ -173,6 +174,7 @@ class DesktopTaskChangeListenerTest : ShellTestCase() { 


    @Test

    @EnableFlags(FLAG_PERCEPTIBLE_TASKS)

    @DesktopTest(cujs = ["b/429989932"])

    fun onTaskOpening_freeformTask_enablePerceptibleTask() {

        val task = createFreeformTask(bounds = TASK_BOUNDS).apply { isVisible = false }

        desktopTaskChangeListener.onTaskOpening(task)
@@ -181,6 +183,7 @@ class DesktopTaskChangeListenerTest : ShellTestCase() { 


    @Test

    @EnableFlags(FLAG_PERCEPTIBLE_TASKS)

    @DesktopTest(cujs = ["b/429989932"])

    fun onTaskOpening_fullscreenTask_notEnablePerceptibleTask() {

        val task = createFullscreenTask().apply { isVisible = true }

        desktopTaskChangeListener.onTaskOpening(task)
@@ -234,6 +237,7 @@ class DesktopTaskChangeListenerTest : ShellTestCase() { 


    @Test

    @EnableFlags(FLAG_PERCEPTIBLE_TASKS)

    @DesktopTest(cujs = ["b/429989932"])

    fun onTaskChanging_fullscreenTask_notEnablePerceptibleTask() {

        val task = createFullscreenTask().apply { isVisible = true }

        desktopTaskChangeListener.onTaskChanging(task)
@@ -242,6 +246,7 @@ class DesktopTaskChangeListenerTest : ShellTestCase() { 


    @Test

    @EnableFlags(FLAG_PERCEPTIBLE_TASKS)

    @DesktopTest(cujs = ["b/429989932"])

    fun onTaskChanging_freeformTask_enablePerceptibleTask() {

        val task = createFreeformTask(bounds = TASK_BOUNDS).apply { isVisible = true }

        desktopTaskChangeListener.onTaskChanging(task)
@@ -327,6 +332,7 @@ class DesktopTaskChangeListenerTest : ShellTestCase() { 


    @Test

    @EnableFlags(FLAG_PERCEPTIBLE_TASKS)

    @DesktopTest(cujs = ["b/429989932"])

    fun onTaskMovingToFront_fullscreenTask_notEnablePerceptibleTask() {

        val task = createFullscreenTask().apply { isVisible = true }

        desktopTaskChangeListener.onTaskMovingToFront(task)
@@ -335,6 +341,7 @@ class DesktopTaskChangeListenerTest : ShellTestCase() { 


    @Test

    @EnableFlags(FLAG_PERCEPTIBLE_TASKS)

    @DesktopTest(cujs = ["b/429989932"])

    fun onTaskMovingToFront_freeformTask_enablePerceptibleTask() {

        val task = createFreeformTask(bounds = TASK_BOUNDS).apply { isVisible = true }

        desktopTaskChangeListener.onTaskMovingToFront(task)
@@ -466,6 +473,7 @@ class DesktopTaskChangeListenerTest : ShellTestCase() { 


    @Test

    @EnableFlags(FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION, FLAG_PERCEPTIBLE_TASKS)

    @DesktopTest(cujs = ["b/429989932"])

    fun onTaskClosing_backNavEnabled_disablePerceptibleTask() {

        val task = createFreeformTask().apply { isVisible = true }

        desktopTaskChangeListener.onTaskOpening(task)
@@ -478,6 +486,7 @@ class DesktopTaskChangeListenerTest : ShellTestCase() { 


    @Test

    @EnableFlags(FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION, FLAG_PERCEPTIBLE_TASKS)

    @DesktopTest(cujs = ["b/429989932"])

    fun onTaskClosing_backNavEnabled_minimizedTask_perceptibleTasks_noop() {

        val task = createFreeformTask().apply { isVisible = true }

        desktopTaskChangeListener.onTaskOpening(task)
@@ -492,6 +501,7 @@ class DesktopTaskChangeListenerTest : ShellTestCase() { 
    @Test

    @EnableFlags(FLAG_PERCEPTIBLE_TASKS)

    @DisableFlags(FLAG_ENABLE_DESKTOP_WINDOWING_BACK_NAVIGATION)

    @DesktopTest(cujs = ["b/429989932"])

    fun onTaskClosing_backNavDisabled_closingTask_disablePerceptibleTask() {

        val task = createFreeformTask().apply { isVisible = true }

        desktopTaskChangeListener.onTaskOpening(task)

services/tests/mockingservicestests/src/com/android/server/am/MockingOomAdjusterTests.java

+3 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ import android.os.PowerManagerInternal; 
import android.os.Process;

import android.os.SystemClock;

import android.os.UserHandle;

import android.platform.test.annotations.DesktopTest;

import android.platform.test.annotations.DisableFlags;

import android.platform.test.annotations.EnableFlags;

import android.platform.test.annotations.Presubmit;
@@ -3840,6 +3841,7 @@ public class MockingOomAdjusterTests { 
    @SuppressWarnings("GuardedBy")

    @Test

    @EnableFlags(Flags.FLAG_PERCEPTIBLE_TASKS)

    @DesktopTest(cujs = {"b/429993976"})

    public void testPerceptibleAdjustment() {

        ProcessRecord app = makeDefaultProcessRecord(MOCKAPP_PID, MOCKAPP_UID, MOCKAPP_PROCESSNAME,

                MOCKAPP_PACKAGENAME, true);
@@ -3886,6 +3888,7 @@ public class MockingOomAdjusterTests { 
    @SuppressWarnings("GuardedBy")

    @Test

    @EnableFlags(Flags.FLAG_PERCEPTIBLE_TASKS)

    @DesktopTest(cujs = {"b/429993976"})

    public void testUpdateOomAdjPerceptible() {

        ProcessRecord app = makeDefaultProcessRecord(MOCKAPP_PID, MOCKAPP_UID, MOCKAPP_PROCESSNAME,

                MOCKAPP_PACKAGENAME, true);