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

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

Merge "Desks: Do not assume a desk exists when checking for tiled tasks" into main

parents 7fcda4d9 10a25670
Loading
Loading
Loading
Loading
+2 −14
Original line number Diff line number Diff line
@@ -348,25 +348,13 @@ class DesktopRepository(
    /** Gets a registered left tiled task to desktop state or returns null. */
    fun getLeftTiledTask(displayId: Int): Int? {
        logD("getLeftTiledTask for displayId=%d", displayId)
        val activeDesk =
            checkNotNull(desktopData.getDefaultDesk(displayId)) {
                "Expected desk in display: $displayId"
            }
        val deskId = activeDesk.deskId
        val desk = checkNotNull(desktopData.getDesk(deskId)) { "Did not find desk: $deskId" }
        return desk.leftTiledTaskId
        return desktopData.getActiveDesk(displayId)?.leftTiledTaskId
    }

    /** gets a registered right tiled task to desktop state or returns null. */
    fun getRightTiledTask(displayId: Int): Int? {
        logD("getRightTiledTask for displayId=%d", displayId)
        val activeDesk =
            checkNotNull(desktopData.getDefaultDesk(displayId)) {
                "Expected desk in display: $displayId"
            }
        val deskId = activeDesk.deskId
        val desk = checkNotNull(desktopData.getDesk(deskId)) { "Did not find desk: $deskId" }
        return desk.rightTiledTaskId
        return desktopData.getActiveDesk(displayId)?.rightTiledTaskId
    }

    /* Unregisters a left tiled task from desktop state. */