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

Commit df6b1338 authored by Jorge Gil's avatar Jorge Gil
Browse files

Do not create desks in invalid displays 

Prevents creation of desks when the request is for an INVALID_DISPLAY.

Flag: com.android.window.flags.enable_multiple_desktops_backend
Bug: 362720497
Test: atest WMShellUnitTests
Change-Id: Id5cda975a5f4d1ca9a20c57e2dd5f26fdbc3b029
parent 7d9d76cf

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/DesktopTasksController.kt

+5 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import android.os.IBinder 
import android.os.SystemProperties

import android.os.UserHandle

import android.util.Slog

import android.view.Display

import android.view.Display.DEFAULT_DISPLAY

import android.view.DragEvent

import android.view.MotionEvent
@@ -464,6 +465,10 @@ class DesktopTasksController( 


    /** Creates a new desk in the given display. */

    fun createDesk(displayId: Int) {

        if (displayId == Display.INVALID_DISPLAY) {

            logW("createDesk attempt with invalid displayId", displayId)

            return

        }

        if (DesktopExperienceFlags.ENABLE_MULTIPLE_DESKTOPS_BACKEND.isTrue) {

            desksOrganizer.createDesk(displayId) { deskId ->

                taskRepository.addDesk(displayId = displayId, deskId = deskId)

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

+9 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import android.platform.test.flag.junit.FlagsParameterization 
import android.testing.TestableContext

import android.view.Display

import android.view.Display.DEFAULT_DISPLAY

import android.view.Display.INVALID_DISPLAY

import android.view.DragEvent

import android.view.Gravity

import android.view.MotionEvent
@@ -7318,6 +7319,14 @@ class DesktopTasksControllerTest(flags: FlagsParameterization) : ShellTestCase() 
        assertThat(taskRepository.getNumberOfDesks(DEFAULT_DISPLAY)).isEqualTo(currentDeskCount + 1)

    }



    @Test

    @EnableFlags(Flags.FLAG_ENABLE_MULTIPLE_DESKTOPS_BACKEND)

    fun testCreateDesk_invalidDisplay_dropsRequest() {

        controller.createDesk(INVALID_DISPLAY)



        verify(desksOrganizer, never()).createDesk(any(), any())

    }



    @Test

    @EnableFlags(

        Flags.FLAG_ENABLE_DESKTOP_WINDOWING_WALLPAPER_ACTIVITY,