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

Commit 237086ae authored by mattsziklay's avatar mattsziklay
Browse files

Properly gate reconnect events. 

Fixes an issue where default desks are not created when reconnecting a
display with the reconnect flag off by fixing the flag gating of the
feature. Now, with the flag off, displays are not preserved and
restoreDisplay is not called, ensuring default desks still get created.

Bug: 424065356
Test: Manual; attempt reconnecting with flag on and off, ensure default
desk is not prevented with flag off
Flag: com.android.window.flags.enable_display_reconnect_interaction

Change-Id: I3b952757b9c24c85240cc55f0561c5a556f21236
parent c848f92c

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

+7 −2
Original line number Diff line number Diff line
@@ -69,7 +69,10 @@ class DesktopDisplayEventHandler( 
        val uniqueDisplayId = displayController.getDisplay(displayId)?.uniqueId

        uniqueDisplayId?.let {

            uniqueIdByDisplayId[displayId] = it

            if (desktopUserRepositories.current.hasPreservedDisplayForUniqueDisplayId(it)) {

            if (

                DesktopExperienceFlags.ENABLE_DISPLAY_RECONNECT_INTERACTION.isTrue &&

                    desktopUserRepositories.current.hasPreservedDisplayForUniqueDisplayId(it)

            ) {

                desktopTasksController.restoreDisplay(displayId, it)

                return@OnDisplayAreaChangeListener

            }
@@ -99,9 +102,11 @@ class DesktopDisplayEventHandler( 
                    }

                }

            )

            if (DesktopExperienceFlags.ENABLE_DISPLAY_RECONNECT_INTERACTION.isTrue) {

                desktopTasksController.preserveDisplayRequestHandler = this

            }

        }

    }



    override fun onDisplayAdded(displayId: Int) =

        traceSection(

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

+0 −1
Original line number Diff line number Diff line
@@ -816,7 +816,6 @@ class DesktopTasksController( 
     * TODO: b/365873835 - Restore for all users, not just current.

     */

    fun restoreDisplay(displayId: Int, uniqueDisplayId: String) {

        if (!DesktopExperienceFlags.ENABLE_DISPLAY_RECONNECT_INTERACTION.isTrue) return

        logD("restoreDisplay: displayId=$displayId, uniqueDisplayId=$uniqueDisplayId")

        // TODO: b/365873835 - Utilize DesktopTask data class once it is

        //  implemented in DesktopRepository.