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

Commit bf87dce3 authored by Gustav Sennton's avatar Gustav Sennton
Browse files

Use TRACE_TAG_WINDOW_MANAGER tag in wm/shell 

Bug: 422901783
Flag: EXEMPT tracing
Test: m
Change-Id: I20b2f6434f21043ca349f234d4e51a3e70613c5b
parent 617aba88

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

+5 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.wm.shell.desktopmode.multidesks 


import android.app.ActivityTaskManager.INVALID_TASK_ID

import android.os.IBinder

import android.os.Trace

import android.view.Display.INVALID_DISPLAY

import android.view.WindowManager.TRANSIT_CHANGE

import android.view.WindowManager.TRANSIT_TO_BACK
@@ -67,7 +68,10 @@ class DesksTransitionObserver( 
     * observer.

     */

    fun onTransitionReady(transition: IBinder, info: TransitionInfo) =

        traceSection("DesksTransitionObserver#onTransitionReady") {

        traceSection(

            traceTag = Trace.TRACE_TAG_WINDOW_MANAGER,

            name = "DesksTransitionObserver#onTransitionReady",

        ) {

            if (!DesktopExperienceFlags.ENABLE_MULTIPLE_DESKTOPS_BACKEND.isTrue) return

            val deskTransitions = deskTransitions.remove(transition)

            deskTransitions?.forEach { deskTransition ->

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

+17 −4
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.graphics.Region 
import android.gui.BorderSettings

import android.gui.BoxShadowSettings

import android.os.Handler

import android.os.Trace

import android.view.Display

import android.view.InsetsSource

import android.view.InsetsState
@@ -140,7 +141,10 @@ abstract class WindowDecoration2<T>( 
        startT: SurfaceControl.Transaction,

        finishT: SurfaceControl.Transaction,

        wct: WindowContainerTransaction,

    ): RelayoutResult<T>? = traceSection("WindowDecoration2#relayout") {

    ): RelayoutResult<T>? = traceSection(

        traceTag = Trace.TRACE_TAG_WINDOW_MANAGER,

        name = "WindowDecoration2#relayout",

    ) {

        taskInfo = params.runningTaskInfo

        hasGlobalFocus = params.hasGlobalFocus

        exclusionRegion.set(params.displayExclusionRegion)
@@ -193,7 +197,10 @@ abstract class WindowDecoration2<T>( 
                )

            } else INVALID_SHADOW_RADIUS



        traceSection("WindowDecoration2#relayout-updateSurfacesAndInsets") {

        traceSection(

            traceTag = Trace.TRACE_TAG_WINDOW_MANAGER,

            name = "WindowDecoration2#relayout-updateSurfacesAndInsets",

        ) {

            updateDecorationContainerSurface(startT, taskWidth, taskHeight)

            updateTaskSurface(

                params,
@@ -378,7 +385,10 @@ abstract class WindowDecoration2<T>( 
    private fun releaseViewsIfNeeded(

        params: RelayoutParams,

        wct: WindowContainerTransaction,

    ) = traceSection("WindowDecoration2#relayout-releaseViewsIfNeeded") {

    ) = traceSection(

        traceTag = Trace.TRACE_TAG_WINDOW_MANAGER,

        name = "WindowDecoration2#relayout-releaseViewsIfNeeded",

    ) {

        val windowDecorConfigInitialized = windowDecorConfig != null

        val fontScaleChanged = windowDecorConfig?.fontScale != taskInfo.configuration.fontScale

        val localeListChanged = windowDecorConfig?.locales != taskInfo.getConfiguration().locales
@@ -473,7 +483,10 @@ abstract class WindowDecoration2<T>( 
        }

    }



    override fun close() = traceSection("WindowDecoration2#close") {

    override fun close() = traceSection(

        traceTag = Trace.TRACE_TAG_WINDOW_MANAGER,

        name = "WindowDecoration2#close",

    ) {

        displayController.removeDisplayWindowListener(onDisplaysChangedListener)

        taskDragResizer?.close()

        captionController?.close()

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

+5 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.graphics.Point 
import android.graphics.PointF

import android.graphics.Rect

import android.os.Handler

import android.os.Trace

import android.view.Display

import android.view.MotionEvent

import android.view.SurfaceControl
@@ -154,7 +155,10 @@ class AppHandleController( 
        startT: SurfaceControl.Transaction,

        finishT: SurfaceControl.Transaction,

        wct: WindowContainerTransaction,

    ): CaptionRelayoutResult = traceSection("AppHandleController#relayout") {

    ): CaptionRelayoutResult = traceSection(

        traceTag = Trace.TRACE_TAG_WINDOW_MANAGER,

        name = "AppHandleController#relayout",

    ) {

        val captionLayout = super.relayout(

            params,

            parentContainer,

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

+5 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.graphics.Bitmap 
import android.graphics.Point

import android.graphics.Rect

import android.os.Handler

import android.os.Trace

import android.view.Display

import android.view.MotionEvent

import android.view.SurfaceControl
@@ -174,7 +175,10 @@ class AppHeaderController( 
        startT: SurfaceControl.Transaction,

        finishT: SurfaceControl.Transaction,

        wct: WindowContainerTransaction,

    ): CaptionRelayoutResult = traceSection("AppHeaderController#relayout") {

    ): CaptionRelayoutResult = traceSection(

        traceTag = Trace.TRACE_TAG_WINDOW_MANAGER,

        name = "AppHeaderController#relayout",

    ) {

        val captionLayout = super.relayout(

            params,

            parentContainer,

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

+17 −4
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.graphics.PixelFormat 
import android.graphics.Rect

import android.graphics.Region

import android.os.Binder

import android.os.Trace

import android.view.Display

import android.view.MotionEvent

import android.view.SurfaceControl
@@ -106,7 +107,10 @@ abstract class CaptionController<T>( 
        startT: SurfaceControl.Transaction,

        finishT: SurfaceControl.Transaction,

        wct: WindowContainerTransaction,

    ): CaptionRelayoutResult = traceSection("CaptionController#relayout") {

    ): CaptionRelayoutResult = traceSection(

        traceTag = Trace.TRACE_TAG_WINDOW_MANAGER,

        name = "CaptionController#relayout",

    ) {

        taskInfo = params.runningTaskInfo

        hasGlobalFocus = params.hasGlobalFocus

        this.decorWindowContext = decorWindowContext
@@ -131,7 +135,10 @@ abstract class CaptionController<T>( 
        val customizableCaptionRegion =

            updateCaptionInsets(params, decorWindowContext, wct, captionHeight, taskBounds)



        traceSection("CaptionController#relayout-updateViewHost") {

        traceSection(

            traceTag = Trace.TRACE_TAG_WINDOW_MANAGER,

            name = "CaptionController#relayout-updateViewHost",

        ) {

            viewHolder.setTopPadding(captionTopPadding)

            viewHolder.setTaskFocusState(params.hasGlobalFocus)

            val localCaptionBounds = Rect(
@@ -178,7 +185,10 @@ abstract class CaptionController<T>( 
        captionHeight: Int,

        startT: SurfaceControl.Transaction,

        touchableRegion: Region?

    ) = traceSection("CaptionController#updateViewHierarchy") {

    ) = traceSection(

        traceTag = Trace.TRACE_TAG_WINDOW_MANAGER,

        name = "CaptionController#updateViewHierarchy",

    ) {

        val lp = WindowManager.LayoutParams(

            captionWidth,

            captionHeight,
@@ -476,7 +486,10 @@ abstract class CaptionController<T>( 
    private fun getOrCreateViewHost(

        context: Context,

        display: Display

    ): WindowDecorViewHost = traceSection("CaptionController#getOrCreateViewHost") {

    ): WindowDecorViewHost = traceSection(

        traceTag = Trace.TRACE_TAG_WINDOW_MANAGER,

        name = "CaptionController#getOrCreateViewHost",

    ) {

        val viewHost = captionViewHost ?: windowDecorViewHostSupplier.acquire(context, display)

        captionViewHost = viewHost

        return viewHost