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

Commit bd776711 authored by Maryam Dehaini's avatar Maryam Dehaini Committed by Android (Google) Code Review
Browse files

Merge "Add more trace logs to window decor" into main

parents 751ca9fc 481d1b13

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

+16 −12
Original line number Diff line number Diff line
@@ -509,7 +509,11 @@ abstract class WindowDecoration2<T>( 
    }



    /** Releases all window decoration views. */

    private fun releaseViews(wct: WindowContainerTransaction) {

    private fun releaseViews(wct: WindowContainerTransaction) =

        traceSection(

            traceTag = Trace.TRACE_TAG_WINDOW_MANAGER,

            name = "WindowDecoration2#releaseViews",

        ) {

            val t = surfaceControlTransactionSupplier()

            var released = false

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

+13 −9
Original line number Diff line number Diff line
@@ -497,7 +497,11 @@ abstract class CaptionController<T>( 
    }



    /** Releases all caption views. Returns true if caption view host is released. */

    open fun releaseViews(wct: WindowContainerTransaction, t: SurfaceControl.Transaction): Boolean {

    open fun releaseViews(wct: WindowContainerTransaction, t: SurfaceControl.Transaction): Boolean =

        traceSection(

            traceTag = Trace.TRACE_TAG_WINDOW_MANAGER,

            name = "CaptionController#releaseViews",

        ) {

            captionInsets?.remove(wct)

            captionInsets = null