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

Commit 029e09cb authored by Omar Elmekkawy's avatar Omar Elmekkawy
Browse files

Remove null checks for desks when removing tiled tasks. 

Desks can be removed without transitions specially if they are not visible.

This change removes a null check for removing tiled tasks from non-existent
desks and gracefully continues execution.

Flag: com.android.window.flags.enable_tile_resizing
Test: EXEMPT, removing null check, tested on device.
Bug: 416139364
Change-Id: Ia73465db76aada067c0b84083e43418f6a863daa
parent 3d3000cc

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

+5 −3
Original line number Diff line number Diff line
@@ -380,8 +380,9 @@ class DesktopRepository( 
    }



    fun removeLeftTiledTaskFromDesk(displayId: Int, deskId: Int) {

        logD("removeLeftTiledTaskToDesk for displayId=%d", displayId)

        val desk = checkNotNull(desktopData.getDesk(deskId)) { "Did not find desk: $deskId" }

        logD("removeLeftTiledTaskFromDesk for displayId=%d", displayId)

        val desk = desktopData.getDesk(deskId)

        if (desk == null) return

        desk.leftTiledTaskId = null

        if (DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_PERSISTENCE.isTrue()) {

            updatePersistentRepositoryForDesk(deskId)
@@ -390,7 +391,8 @@ class DesktopRepository( 


    fun removeRightTiledTaskFromDesk(displayId: Int, deskId: Int) {

        logD("removeRightTiledTaskFromDesk for displayId=%d", displayId)

        val desk = checkNotNull(desktopData.getDesk(deskId)) { "Did not find desk: $deskId" }

        val desk = desktopData.getDesk(deskId)

        if (desk == null) return

        desk.rightTiledTaskId = null

        if (DesktopModeFlags.ENABLE_DESKTOP_WINDOWING_PERSISTENCE.isTrue()) {

            updatePersistentRepositoryForDesk(deskId)