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

Commit 06e4ca5e authored by Maryam Dehaini's avatar Maryam Dehaini
Browse files

launch coroutine to start transition to prevent binder call from blocking main thread 

Adds changes from ag/33267742 to windowDecor2

Bug: 437194304
Test: manual testing
Flag: com.android.window.flags.enable_window_decoration_refactor
Change-Id: Ia4b44e4aaed413ffdb311270d475461d904042c0
parent 43df27f2

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/DefaultWindowDecoration.kt

+2 −0
Original line number Diff line number Diff line
@@ -147,6 +147,8 @@ constructor( 
        surfaceControlSupplier,

        taskOrganizer,

        handler,

        mainScope,

        transitions,

    ) {

    private var appToWebRepository =

        AppToWebRepository(userContext, taskInfo.taskId, assistContentRequester, genericLinksParser)

libs/WindowManager/Shell/src/com/android/wm/shell/windowdecor/WindowDecoration2.kt

+24 −2
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import android.view.SurfaceControlViewHost 
import android.view.View

import android.view.WindowInsets

import android.view.WindowManager.LayoutParams

import android.view.WindowManager.TRANSIT_CHANGE

import android.view.WindowlessWindowManager

import android.window.DesktopExperienceFlags

import android.window.TaskConstants
@@ -45,9 +46,12 @@ import com.android.wm.shell.common.BoxShadowHelper 
import com.android.wm.shell.common.DisplayController

import com.android.wm.shell.common.DisplayController.OnDisplaysChangedListener

import com.android.wm.shell.shared.annotations.ShellMainThread

import com.android.wm.shell.transition.Transitions

import com.android.wm.shell.windowdecor.caption.CaptionController

import com.android.wm.shell.windowdecor.extension.getDimensionPixelSize

import com.android.wm.shell.windowdecor.extension.isVisible

import kotlinx.coroutines.CoroutineScope

import kotlinx.coroutines.launch



/**

 * Manages a container surface and a windowless window to show window decorations. Responsible to
@@ -72,6 +76,8 @@ abstract class WindowDecoration2<T>( 
    private val surfaceControlSupplier: () -> SurfaceControl,

    private val taskOrganizer: ShellTaskOrganizer,

    @ShellMainThread private val handler: Handler,

    @ShellMainThread private val mainScope: CoroutineScope,

    private val transitions: Transitions,

    private val surfaceControlBuilderSupplier: () -> SurfaceControl.Builder = {

        SurfaceControl.Builder()

    },
@@ -289,8 +295,16 @@ abstract class WindowDecoration2<T>( 
        val t = surfaceControlTransactionSupplier()

        captionController?.releaseViews(wct, t)

        t.apply()

        if (!wct.isEmpty) {

            if (DesktopExperienceFlags.ENABLE_DESKTOP_WINDOWING_PIP.isTrue) {

                mainScope.launch {

                    transitions.startTransition(TRANSIT_CHANGE, wct, /* handler= */ null)

                }

            } else {

                taskOrganizer.applyTransaction(wct)

            }

        }

    }



    private fun updateTaskSurface(

        params: RelayoutParams,
@@ -537,7 +551,15 @@ abstract class WindowDecoration2<T>( 
            captionController?.close()

            val wct = windowContainerTransactionSupplier()

            releaseViews(wct)

            if (!wct.isEmpty) {

                if (DesktopExperienceFlags.ENABLE_DESKTOP_WINDOWING_PIP.isTrue) {

                    mainScope.launch {

                        transitions.startTransition(TRANSIT_CHANGE, wct, /* handler= */ null)

                    }

                } else {

                    taskOrganizer.applyTransaction(wct)

                }

            }

            taskSurface.release()

        }